diff options
| author | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-12-06 16:05:46 +0000 |
|---|---|---|
| committer | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-12-06 16:05:46 +0000 |
| commit | 80ba5c5efdc23e3922b8f8f5152ceeaefa6951b6 (patch) | |
| tree | 2eb2141eb77d43701e718b5b5ab1cbd07401015f /qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java | |
| parent | 1d44d6e7a3369fb7773ba50d02c3baa8955da382 (diff) | |
| download | qpid-python-80ba5c5efdc23e3922b8f8f5152ceeaefa6951b6.tar.gz | |
Attempt one at merge from r1021441:HEADgrkvlt-network-20101013
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1042697 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java index cae11e3962..32c7ef29de 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java @@ -223,8 +223,10 @@ public class AMQMessageDelegate_0_10 extends AbstractAMQMessageDelegate String exchange = replyTo.getExchange(); String routingKey = replyTo.getRoutingKey(); - dest = generateDestination(exchange == null ? null : new AMQShortString(exchange), - routingKey == null ? null : new AMQShortString(routingKey)); + dest = generateDestination(exchange == null ? new AMQShortString("") : + new AMQShortString(exchange), + routingKey == null ? new AMQShortString(""): + new AMQShortString(routingKey)); _destinationCache.put(replyTo, new SoftReference<Destination>(dest)); } |