diff options
author | Robert Godfrey <rgodfrey@apache.org> | 2014-09-08 12:29:26 +0000 |
---|---|---|
committer | Robert Godfrey <rgodfrey@apache.org> | 2014-09-08 12:29:26 +0000 |
commit | b2c1ccdc33af4148a39221e81d0c0e3bea60aca3 (patch) | |
tree | 5172f71f53767c7d438f47969e35928261b9384e | |
parent | 1e25b5ab6c98bcf6263024e5f657e8519828f809 (diff) | |
download | qpid-python-b2c1ccdc33af4148a39221e81d0c0e3bea60aca3.tar.gz |
QPID-6077 : Merged revision 1622886 from trunk to 0.30
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1623372 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java index 0407453160..a23aa77316 100644 --- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java +++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java @@ -21,12 +21,23 @@ package org.apache.qpid.amqp_1_0.transport; -import org.apache.qpid.amqp_1_0.type.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +import org.apache.qpid.amqp_1_0.type.Binary; +import org.apache.qpid.amqp_1_0.type.DeliveryState; +import org.apache.qpid.amqp_1_0.type.Outcome; +import org.apache.qpid.amqp_1_0.type.UnsignedInteger; import org.apache.qpid.amqp_1_0.type.transaction.TransactionalState; -import org.apache.qpid.amqp_1_0.type.transport.*; - - -import java.util.*; +import org.apache.qpid.amqp_1_0.type.transport.Attach; +import org.apache.qpid.amqp_1_0.type.transport.Flow; +import org.apache.qpid.amqp_1_0.type.transport.Role; +import org.apache.qpid.amqp_1_0.type.transport.Transfer; public class ReceivingLinkEndpoint extends LinkEndpoint<ReceivingLinkListener> { @@ -428,6 +439,8 @@ public class ReceivingLinkEndpoint extends LinkEndpoint<ReceivingLinkListener> public void settle(Binary deliveryTag) { super.settle(deliveryTag); + _unsettledIds.remove(deliveryTag); + _unsettledMap.remove(deliveryTag); if(_creditWindow) { sendFlowConditional(); |