You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2007/05/08 00:20:00 UTC

svn commit: r536008 - /incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java

Author: rgodfrey
Date: Mon May  7 15:19:59 2007
New Revision: 536008

URL: http://svn.apache.org/viewvc?view=rev&rev=536008
Log:
QPID-480 : Avoid deadlock on UnacknowledgedMessageMap and ConcurrentSelectorDeliveryManager

Modified:
    incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java

Modified: incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?view=diff&rev=536008&r1=536007&r2=536008
==============================================================================
--- incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Mon May  7 15:19:59 2007
@@ -816,13 +816,14 @@
             }
 
             _unacknowledgedMessageMap.acknowledgeMessage(deliveryTag, multiple, _txnContext);
-            checkSuspension();
+
             if (_log.isDebugEnabled())
             {
                 _log.debug("Unacked (PostAck) Size:" + _unacknowledgedMessageMap.size());
             }
 
         }
+        checkSuspension();
     }
 
     /**