[jboss-cvs] JBoss Messaging SVN: r8431 - branches/Branch_1_4/src/main/org/jboss/jms/client/container.

[jboss-cvs-commits at lists.jboss.org]

Author: gaohoward
Date: 2011-08-30 19:11:33 -0400 (Tue, 30 Aug 2011)
New Revision: 8431

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/client/container/SessionAspect.java
Log:
JBMESSAGING-1895


Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/container/SessionAspect.java	2011-08-29 15:53:58 UTC (rev 8430)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/container/SessionAspect.java	2011-08-30 23:11:33 UTC (rev 8431)
@@ -612,12 +612,24 @@
          {
             // This is ok. The original consumer has closed, so we cancel the message
             
+            //we need to release the lock to avoid dead lock
+            //JBMESSAGING-1895
+            if (rm.failoverLock.isHeldByCurrentThread())
+            {
+               rm.failoverLock.unlock();
+            }
             cancelDelivery(del, info);
          }
          else if (handler.getRedeliveryDelay() != 0)
          {
          	//We have a redelivery delay in action - all delayed redeliveries are handled on the server
          	
+            //we need to release the lock to avoid dead lock
+            //JBMESSAGING-1895
+            if (rm.failoverLock.isHeldByCurrentThread())
+            {
+               rm.failoverLock.unlock();
+            }
          	cancelDelivery(del, info);
          }
          else