summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2015-02-11 18:26:39 +0000
committerRobert Godfrey <rgodfrey@apache.org>2015-02-11 18:26:39 +0000
commite31d29d9127d2861b818978e324104d2cca64133 (patch)
treecd61f001691c1ac8069ac7e4f9ecdf2c750cb064
parent51f24c14d4efffede82db506aff5796e4d048118 (diff)
downloadqpid-python-e31d29d9127d2861b818978e324104d2cca64133.tar.gz
QPID-6381 : don't delete link endpoints which are detached and have terminus durability CONFIGURATION
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1659037 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java3
1 files changed, 2 insertions, 1 deletions
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 d1d1227818..85a0b559c9 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
@@ -406,7 +406,8 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS
{
//TODO
// if not durable or close
- if(Boolean.TRUE.equals(detach.getClosed()) || !TerminusDurability.UNSETTLED_STATE.equals(_durability))
+ if(Boolean.TRUE.equals(detach.getClosed())
+ || !(TerminusDurability.UNSETTLED_STATE.equals(_durability)|| TerminusDurability.CONFIGURATION.equals(_durability)))
{
while(!_consumer.trySendLock())
{