[jboss-svn-commits] JBL Code SVN: r26729 - labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator.

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

Author: jhalliday
Date: 2009-05-26 06:00:16 -0400 (Tue, 26 May 2009)
New Revision: 26729

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java
Log:
Port reaper thread fix from trunk to CP branch. JBTM-551


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java	2009-05-26 09:45:53 UTC (rev 26728)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/coordinator/ReaperThread.java	2009-05-26 10:00:16 UTC (rev 26729)
@@ -80,6 +80,12 @@
     
             synchronized(reaperObject)
             {
+                // test our condition -- things may have changed while we were checking
+
+                if (_shutdown) {
+                    return;
+                }
+
 		sleepPeriod = reaperObject.checkingPeriod();
         
                 if (sleepPeriod > 0)
@@ -98,6 +104,12 @@
                           reaperObject.wait(sleepPeriod);
                      }
                      catch (InterruptedException e1) {}
+
+                    // test our condition -- things may have changed while we were waiting
+
+                    if (_shutdown) {
+                        return;
+                    }
                 }
             }
     
@@ -107,9 +119,6 @@
                                           FacilityCode.FAC_ATOMIC_ACTION, "ReaperThread.run ()");
             }
 
-    	    if (_shutdown)
-    	        return;
-    
     	    reaperObject.check();
     	}
     }