[jboss-svn-commits] JBL Code SVN: r29937 - labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj.

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

Author: mark.little at jboss.com
Date: 2009-11-03 13:46:41 -0500 (Tue, 03 Nov 2009)
New Revision: 29937

Modified:
   labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java
Log:
https://jira.jboss.org/jira/browse/JBTM-610

Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java	2009-11-03 18:43:19 UTC (rev 29936)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java	2009-11-03 18:46:41 UTC (rev 29937)
@@ -413,7 +413,9 @@
         while ((conflict == ConflictType.CONFLICT)
                 && ((retry >= 0) || (retry == LockManager.waitTotalTimeout)))
         {
-            synchronized (currAct)
+            Object syncObject = ((currAct == null) ? getMutex() : currAct);
+            
+            synchronized (syncObject)
             {
                 synchronized (locksHeldLockObject)
                 {