QPID-4146 Applying patch attached by Pavel Moravec with modifications.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1389991 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 0 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 16f464c496..e5f3e33d15 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
@@ -356,6 +356,13 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic
             
             for (Binding binding: bindings)
             {
+                // Currently there is a bug (QPID-3317) with setting up and tearing down x-bindings for link.
+                // The null check below is a way to side step that issue while fixing QPID-4146
+                // Note this issue only affects producers.
+                if (binding.getQueue() == null && queueName == null)
+                {
+                    continue;
+                }
                 String queue = binding.getQueue() == null?
                                    queueName.asString(): binding.getQueue();
                                    
@@ -1237,6 +1244,8 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic
                         {
                             createSubscriptionQueue(dest,noLocal);
                         }
+                        sendQueueBind(dest.getAMQQueueName(), dest.getRoutingKey(),
+                                null,dest.getExchangeName(),dest, false);
                         break;
                     }
                 }