summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-09-08 12:28:16 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-09-08 12:28:16 +0000
commit1e25b5ab6c98bcf6263024e5f657e8519828f809 (patch)
treeb790c9a72ff98583637f3c9c792ca66d39c5d523
parentb32805028ccffd85a7c6149d32190a449816d851 (diff)
downloadqpid-python-1e25b5ab6c98bcf6263024e5f657e8519828f809.tar.gz
QPID-6076 : Merged revision 1622884 from trunk to 0.30
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1623371 13f79535-47bb-0310-9956-ffa450edef68
-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)
{