From 1f415fa9c3b55cae81039625ae846aa8ba0e2203 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Mon, 7 May 2007 22:19:59 +0000
Subject: QPID-480 : Avoid deadlock on UnacknowledgedMessageMap and
 ConcurrentSelectorDeliveryManager

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@536008 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 918b5fc176..b48953ad33 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -816,13 +816,14 @@ public class AMQChannel
             }
 
             _unacknowledgedMessageMap.acknowledgeMessage(deliveryTag, multiple, _txnContext);
-            checkSuspension();
+
             if (_log.isDebugEnabled())
             {
                 _log.debug("Unacked (PostAck) Size:" + _unacknowledgedMessageMap.size());
             }
 
         }
+        checkSuspension();
     }
 
     /**
-- 
cgit v1.2.1