From dca02f49f5e3d30d6565862c001d347bf380b457 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sat, 8 Mar 2014 10:52:23 +0000 Subject: QPID-5601 : Allow for messages with null routing keys git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1575507 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/qpid/server/exchange/DefaultDestination.java | 4 ++-- .../java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java index 123a4f0a63..c3ddc6c27a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java @@ -58,7 +58,7 @@ public class DefaultDestination implements MessageDestination final AMQQueue q = _virtualHost.getQueue(routingAddress); if(q == null) { - if(routingAddress.contains("/") && !routingAddress.startsWith("/")) + if(routingAddress != null && routingAddress.contains("/") && !routingAddress.startsWith("/")) { String[] parts = routingAddress.split("/",2); ExchangeImpl exchange = _virtualHost.getExchange(parts[0]); @@ -67,7 +67,7 @@ public class DefaultDestination implements MessageDestination return exchange.send(message, parts[1], instanceProperties, txn, postEnqueueAction); } } - else if(!routingAddress.contains("/")) + else if(routingAddress == null || !routingAddress.contains("/")) { ExchangeImpl exchange = _virtualHost.getExchange(routingAddress); if(exchange != null) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java index 70eecbb164..1e0226308b 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java @@ -182,7 +182,7 @@ public class DefaultExchangeRegistry implements ExchangeRegistry public ExchangeImpl getExchange(String name) { - return _exchangeMap.get(name); + return name == null ? null : _exchangeMap.get(name); } @Override -- cgit v1.2.1