summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2013-08-21 09:25:14 +0000
committerRobert Godfrey <rgodfrey@apache.org>2013-08-21 09:25:14 +0000
commit766d5e135886b2eecf5973481c4ebf9923eb4a59 (patch)
treedf48a0e4178db4ac35dc04204325e79c25ed8f0d /java
parent8678750648ed61a0ed9b1f0a5e7ae37fd6cd96ac (diff)
downloadqpid-python-766d5e135886b2eecf5973481c4ebf9923eb4a59.tar.gz
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/qpid@1516121 13f79535-47bb-0310-9956-ffa450edef68
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)