From 9dc92c03d0fb24075ace8a44550e565866b06b0d Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Wed, 30 Sep 2009 15:55:59 +0000
Subject: Prevent NPE in QueueEntryImpl.debugIdentity

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@820318 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/qpid/server/queue/QueueEntryImpl.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
index dbad5438dc..01b249b847 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
@@ -177,7 +177,15 @@ public class QueueEntryImpl implements QueueEntry
 
     public String debugIdentity()
     {
-        return getMessage().debugIdentity();
+        AMQMessage message = getMessage();
+        if (message == null)
+        {
+            return "null";
+        }
+        else
+        {
+            return message.debugIdentity();
+        }
     }
 
 
-- 
cgit v1.2.1