summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-09-06 16:34:09 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-09-06 16:34:09 +0000
commit076287fbd5b99074d37b3ac5d8bf192c3fc1ff91 (patch)
treed28d58baae35ea35f7a04b02e5a761f791d99db8 /qpid/java
parent231433965ad0d7d4eb0e24e3ac978059fd059c7c (diff)
downloadqpid-python-076287fbd5b99074d37b3ac5d8bf192c3fc1ff91.tar.gz
QPID-6076 : Sending a message with no routing key to the default exchange in the java broker results in an NPE
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1622884 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java6
1 files changed, 5 insertions, 1 deletions
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 e9e6bbd30a..127a8d9e52 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
@@ -50,11 +50,15 @@ public class DefaultDestination implements MessageDestination
public final <M extends ServerMessage<? extends StorableMessageMetaData>> int send(final M message,
- final String routingAddress,
+ String routingAddress,
final InstanceProperties instanceProperties,
final ServerTransaction txn,
final Action<? super MessageInstance> postEnqueueAction)
{
+ if(routingAddress == null)
+ {
+ routingAddress = "";
+ }
final AMQQueue q = _virtualHost.getQueue(routingAddress);
if(q == null)
{