From 8328e0398707d2cccdadb95fe1b4c4563b930cc1 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Tue, 26 Aug 2014 16:50:34 +0000 Subject: QPID-6046 : [Java Broker] [AMQP 1.0] when creating an outgoing link from the address amq.fanout (or any fanout exchange) bind the temporary queue to the exchange witht the queue name git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620657 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java index 660575e364..2cfe431979 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java @@ -324,13 +324,13 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS exchange.addBinding(exchangeDestination.getInitialRoutingAddress(),queue,null); } if(binding == null - && exchangeDestination.getInitialRoutingAddress() != null + && exchangeDestination.getInitialRoutingAddress() == null && exchange.getType().equals(ExchangeDefaults.FANOUT_EXCHANGE_CLASS)) { exchange.addBinding(queue.getName(), queue, null); } else if(binding == null - && exchangeDestination.getInitialRoutingAddress() != null + && exchangeDestination.getInitialRoutingAddress() == null && exchange.getType().equals(ExchangeDefaults.TOPIC_EXCHANGE_CLASS)) { exchange.addBinding("#", queue, null); -- cgit v1.2.1