You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/04/11 02:22:21 UTC

svn commit: r764119 - in /qpid/branches/0.5-release/qpid/java: broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java

Author: ritchiem
Date: Sat Apr 11 00:22:21 2009
New Revision: 764119

URL: http://svn.apache.org/viewvc?rev=764119&view=rev
Log:
 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

merged from trunk r764079

Added:
    qpid/branches/0.5-release/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
      - copied unchanged from r764079, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
Modified:
    qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java

Modified: qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java?rev=764119&r1=764118&r2=764119&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java (original)
+++ qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java Sat Apr 11 00:22:21 2009
@@ -158,7 +158,7 @@
         else
         {
             QueueEntry queueEntry;
-            queueEntry = unacknowledgedMessageMap.get(deliveryTag);
+            queueEntry = unacknowledgedMessageMap.remove(deliveryTag);
 
             if (debug)
             {
@@ -187,9 +187,6 @@
             // from the transaciton log
             queueEntry.dequeueAndDelete(_storeContext);
 
-            unacknowledgedMessageMap.remove(deliveryTag);
-
-
         }
         if(_inTran)
         {



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org