qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1620715 - /qpid/branches/0.30/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
Date Tue, 26 Aug 2014 19:50:27 GMT
Author: rgodfrey
Date: Tue Aug 26 19:50:26 2014
New Revision: 1620715

URL: http://svn.apache.org/r1620715
Log:
QPID-6066 : Merged from trunk onto the 0.30 branch

Modified:
    qpid/branches/0.30/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java

Modified: qpid/branches/0.30/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1620715&r1=1620714&r2=1620715&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
(original)
+++ qpid/branches/0.30/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
Tue Aug 26 19:50:26 2014
@@ -323,6 +323,19 @@ public class SendingLink_1_0 implements 
                 {
                     exchange.addBinding(exchangeDestination.getInitialRoutingAddress(),queue,null);
                 }
+                if(binding == null
+                   && exchangeDestination.getInitialRoutingAddress() == null
+                   && exchange.getType().equals(ExchangeDefaults.FANOUT_EXCHANGE_CLASS))
+                {
+                    exchange.addBinding(queue.getName(), queue, null);
+                }
+                else if(binding == null
+                     && exchangeDestination.getInitialRoutingAddress() == null
+                     && exchange.getType().equals(ExchangeDefaults.TOPIC_EXCHANGE_CLASS))
+                {
+                    exchange.addBinding("#", queue, null);
+                }
+
                 source.setDistributionMode(StdDistMode.COPY);
 
                 qd = new QueueDestination(queue);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message