summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2007-05-07 22:19:59 +0000
committerRobert Godfrey <rgodfrey@apache.org>2007-05-07 22:19:59 +0000
commit1f415fa9c3b55cae81039625ae846aa8ba0e2203 (patch)
tree9d0afd91e0fd4dd3d4bda07c588f84c203b496bf /java
parent0a1e2a4cba618294d22200786cb0ae4952d3a796 (diff)
downloadqpid-python-1f415fa9c3b55cae81039625ae846aa8ba0e2203.tar.gz
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
Diffstat (limited to 'java')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java3
1 files changed, 2 insertions, 1 deletions
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();
}
/**