diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2013-08-21 09:25:14 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2013-08-21 09:25:14 +0000 |
| commit | bb46b3d7254bf87c3d415fa50998c9d6d0e9c9a8 (patch) | |
| tree | f4b3481fd2bff020d1eeab8677aa8fe688a56429 /qpid/java | |
| parent | 1b476c06272af18c808caf8b719ab74d82863bae (diff) | |
| download | qpid-python-bb46b3d7254bf87c3d415fa50998c9d6d0e9c9a8.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@1516121 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java | 2 |
1 files changed, 1 insertions, 1 deletions
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) |