From bb46b3d7254bf87c3d415fa50998c9d6d0e9c9a8 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Wed, 21 Aug 2013 09:25:14 +0000
Subject: QPID-5088 : [Java Broker] fix NPE when null queue name is looked up
 in the queue registry

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1516121 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
index 513bbeac3d..7d091dbf73 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
+++ b/qpid/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)
-- 
cgit v1.2.1