From 076287fbd5b99074d37b3ac5d8bf192c3fc1ff91 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Sat, 6 Sep 2014 16:34:09 +0000
Subject: 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
---
 .../java/org/apache/qpid/server/exchange/DefaultDestination.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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)
         {
-- 
cgit v1.2.1