summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-29 20:32:07 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-29 20:32:07 +0000
commit3a74e820a649adf9644161370e8140bc19f8ce56 (patch)
tree19d1b06fe608a36253121b3b79e167624c72abe0
parent674a3d4b7a839263d77e06733e9556bf4d441ee9 (diff)
downloadqpid-python-3a74e820a649adf9644161370e8140bc19f8ce56.tar.gz
Merged QPID-6054 (r1621281) to 0.30 from trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1621380 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/ReceivingLink_1_0.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
index 2e7e1cf097..83430e6008 100644
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
@@ -71,6 +71,8 @@ public class ReceivingLink_1_0 implements ReceivingLinkListener, Link_1_0, Deliv
_vhost = vhost;
_destination = destination;
_attachment = receivingLinkAttachment;
+ _receivingSettlementMode = receivingLinkAttachment.getEndpoint().getReceivingSettlementMode();
+
receivingLinkAttachment.setDeliveryStateHandler(this);
_durability = ((Target)receivingLinkAttachment.getTarget()).getDurable();