summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2015-02-11 18:48:22 +0000
committerRobert Godfrey <rgodfrey@apache.org>2015-02-11 18:48:22 +0000
commit647d21b7ce2bae2174a22019c6cc2e2fd0a2e13d (patch)
tree97f94e0ba8932ac85f179172c948c90b2296a757 /qpid/java/broker-plugins
parente31d29d9127d2861b818978e324104d2cca64133 (diff)
downloadqpid-python-647d21b7ce2bae2174a22019c6cc2e2fd0a2e13d.tar.gz
QPID-6240 : Rollback of transactions with settled acks should release the queue entries
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1659039 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
-rw-r--r--qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
index f19ce6b1be..829b3bf336 100644
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
@@ -426,7 +426,7 @@ class ConsumerTarget_1_0 extends AbstractConsumerTarget
modified.setDeliveryFailed(true);
_link.getEndpoint().updateDisposition(_deliveryTag, modified, true);
_link.getEndpoint().sendFlowConditional();
- _queueEntry.unlockAcquisition();
+ _queueEntry.release();
}
}
});