summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Greig <rgreig@apache.org>2006-12-18 10:08:09 +0000
committerRobert Greig <rgreig@apache.org>2006-12-18 10:08:09 +0000
commit35aee343f206afc69730dd192e59af02c84c7716 (patch)
tree7d832f378512edacd0c0adf007047dbf2503ba43 /qpid/java
parent427da44d331d1f4b0ce7ba23d412d407c8230a54 (diff)
downloadqpid-python-35aee343f206afc69730dd192e59af02c84c7716.tar.gz
QPID-211 : Patch supplied by Rob Godfrey - Perform null check against routing key before looking in the map
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@488188 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
index ffd0e5d8ae..d4069fa315 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
@@ -171,7 +171,7 @@ public class DestNameExchange extends AbstractExchange
BasicPublishBody publishBody = payload.getPublishBody();
final String routingKey = publishBody.routingKey;
- final List<AMQQueue> queues = _index.get(routingKey);
+ final List<AMQQueue> queues = (routingKey == null) ? null : _index.get(routingKey);
if (queues == null || queues.isEmpty())
{
String msg = "Routing key " + routingKey + " is not known to " + this;