QPID-3953 : Fix durable subscriber unsubscribe to explicitly set durability of link to NONE

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

1 files changed, 6 insertions, 1 deletions

diff --git a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
index a9a6ade642..ad390fd498 100644
--- a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
@@ -85,7 +85,7 @@ public class Receiver implements DeliveryStateHandler
             source.setDurable(TerminusDurability.UNSETTLED_STATE);

             source.setExpiryPolicy(TerminusExpiryPolicy.NEVER);

         }

-        else

+        else if(source != null)

         {

             source.setDurable(TerminusDurability.NONE);

             source.setExpiryPolicy(TerminusExpiryPolicy.LINK_DETACH);

@@ -542,6 +542,11 @@ public class Receiver implements DeliveryStateHandler
         return _session;

     }

 

+    public org.apache.qpid.amqp_1_0.type.Source getSource()

+    {

+        return _endpoint.getSource();

+    }

+

     public static interface SettledAction

     {

         public void onSettled(Binary deliveryTag);