diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-09-30 15:55:59 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-09-30 15:55:59 +0000 |
| commit | 16852bfd0edf9498ace4011076b15f10f3f3091d (patch) | |
| tree | 1002fd98f98d292283f4a18e834efa558007582a /java | |
| parent | dddef1e6e186fc2ee526b6f337edb80bf7627556 (diff) | |
| download | qpid-python-16852bfd0edf9498ace4011076b15f10f3f3091d.tar.gz | |
Prevent NPE in QueueEntryImpl.debugIdentity
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820318 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java index dbad5438dc..01b249b847 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java +++ b/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(); + } } |