summaryrefslogtreecommitdiff
path: root/qpid/java/broker
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-04-10 22:10:31 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-04-10 22:10:31 +0000
commit98548954e7ef986bfc0ad92da4610e807e719925 (patch)
tree63e278e01190d3164a5979826fdfdd195656c134 /qpid/java/broker
parent553e8cc73ff51c9850bdb3ddc8c8f4f356738a85 (diff)
downloadqpid-python-98548954e7ef986bfc0ad92da4610e807e719925.tar.gz
QPID-1791 : Replaced the get call before the dequeueAndDelete with a remove. So the remove call after the delete is now nolonger requried.
Added manual test to assist identifing the problem git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764079 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
index 2f27e1405a..9a90dd4bb2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
@@ -158,7 +158,7 @@ public class NonTransactionalContext implements TransactionalContext
else
{
QueueEntry queueEntry;
- queueEntry = unacknowledgedMessageMap.get(deliveryTag);
+ queueEntry = unacknowledgedMessageMap.remove(deliveryTag);
if (debug)
{
@@ -187,9 +187,6 @@ public class NonTransactionalContext implements TransactionalContext
// from the transaciton log
queueEntry.dequeueAndDelete(_storeContext);
- unacknowledgedMessageMap.remove(deliveryTag);
-
-
}
if(_inTran)
{