summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
index 513bbeac3d..7d091dbf73 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
@@ -81,7 +81,7 @@ public class DefaultQueueRegistry implements QueueRegistry
public AMQQueue getQueue(String queue)
{
- return _queueMap.get(queue);
+ return queue == null ? null : _queueMap.get(queue);
}
public void addRegistryChangeListener(RegistryChangeListener listener)