summaryrefslogtreecommitdiff
path: root/java/client/src
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2010-09-02 19:11:23 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2010-09-02 19:11:23 +0000
commitcdcd6a3bff13e58aea5dc47904adacf5b068eb3f (patch)
treed83b48f9981e828a0973baf303c2c2cd2c90b1c6 /java/client/src
parent4dcd13bb84c95a17741d2956dd5b1f9edc065aa0 (diff)
downloadqpid-python-cdcd6a3bff13e58aea5dc47904adacf5b068eb3f.tar.gz
QPID-2844
If an entry within the x-bindings doesn't contain an exchange, the address name is used as the exchange if address resolves to an exchange else amq.topic is used. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@992061 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client/src')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 0563276457..41ad9f543e 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -343,16 +343,25 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic
List<Binding> bindings = new ArrayList<Binding>();
bindings.addAll(destination.getSourceNode().getBindings());
bindings.addAll(destination.getTargetNode().getBindings());
+
+ String defaultExchange = destination.getAddressType() == AMQDestination.TOPIC_TYPE ?
+ destination.getAddressName(): "amq.topic";
+
for (Binding binding: bindings)
{
String queue = binding.getQueue() == null?
queueName.asString(): binding.getQueue();
+
+ String exchange = binding.getExchange() == null ?
+ defaultExchange :
+ binding.getExchange();
+
_logger.debug("Binding queue : " + queue +
- " exchange: " + binding.getExchange() +
+ " exchange: " + exchange +
" using binding key " + binding.getBindingKey() +
" with args " + printMap(binding.getArgs()));
getQpidSession().exchangeBind(queue,
- binding.getExchange(),
+ exchange,
binding.getBindingKey(),
binding.getArgs());
}