From cdcd6a3bff13e58aea5dc47904adacf5b068eb3f Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Thu, 2 Sep 2010 19:11:23 +0000 Subject: 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 --- .../main/java/org/apache/qpid/client/AMQSession_0_10.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'java') 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 bindings = new ArrayList(); 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()); } -- cgit v1.2.1