diff options
| author | Alex Rudyy <orudyy@apache.org> | 2013-03-28 15:42:39 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2013-03-28 15:42:39 +0000 |
| commit | eae2b134840386ce3654737476142b96a12a404f (patch) | |
| tree | c9f0a71ebb2d19496f6a656cd21002935e2d15f4 /qpid/java/broker/src/main | |
| parent | 56bd292e1e13798edef69bc58c6b84bbc38aa888 (diff) | |
| download | qpid-python-eae2b134840386ce3654737476142b96a12a404f.tar.gz | |
QPID-4671: [Java Broker] Fix NPE occuring in FanoutExchange#isBound(... AMQQueue) when queue parameter is null
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1462162 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java index 8c433ce985..6ad5eb261e 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java @@ -76,7 +76,7 @@ public class FanoutExchange extends AbstractExchange public boolean isBound(AMQShortString routingKey, AMQQueue queue) { - return _queues.containsKey(queue); + return isBound(queue); } public boolean isBound(AMQShortString routingKey) @@ -87,7 +87,10 @@ public class FanoutExchange extends AbstractExchange public boolean isBound(AMQQueue queue) { - + if (queue == null) + { + return false; + } return _queues.containsKey(queue); } |