summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-05-09 15:06:06 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-05-09 15:06:06 +0000
commit59fcffb8aac5234521f4ae98cfa16970c061109c (patch)
tree897bf280004ef6a15f6451de05a8b9d2fdc5c5b7 /qpid/java
parent29f2cfe7529b2242e13257bd80649ee5b989ddb6 (diff)
downloadqpid-python-59fcffb8aac5234521f4ae98cfa16970c061109c.tar.gz
Merged revisions 536008 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r536008 | rgodfrey | 2007-05-07 23:19:59 +0100 (Mon, 07 May 2007) | 1 line QPID-480 : Avoid deadlock on UnacknowledgedMessageMap and ConcurrentSelectorDeliveryManager ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@536556 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 6dd80b3bfa..4361194dc3 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -817,13 +817,14 @@ public class AMQChannel
}
_unacknowledgedMessageMap.acknowledgeMessage(deliveryTag, multiple, _txnContext);
- checkSuspension();
+
if (_log.isDebugEnabled())
{
_log.debug("Unacked (PostAck) Size:" + _unacknowledgedMessageMap.size());
}
}
+ checkSuspension();
}
/**