Author: ritchiem
Date: Wed May 9 08:06:06 2007
New Revision: 536556
URL: http://svn.apache.org/viewvc?view=rev&rev=536556
Log:
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
........
Modified:
incubator/qpid/trunk/qpid/ (props changed)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
Propchange: incubator/qpid/trunk/qpid/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?view=diff&rev=536556&r1=536555&r2=536556
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
Wed May 9 08:06:06 2007
@@ -817,13 +817,14 @@
}
_unacknowledgedMessageMap.acknowledgeMessage(deliveryTag,
multiple, _txnContext);
- checkSuspension();
+
if (_log.isDebugEnabled())
{
_log.debug("Unacked (PostAck) Size:" +
_unacknowledgedMessageMap.size());
}
}
+ checkSuspension();
}
/**
