[jboss-svn-commits] JBL Code SVN: r26595 - in labs/jbosstm/trunk/XTS: sar/src/org/jboss/jbossts and 1 other directory.

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

Author: adinn
Date: 2009-05-18 11:24:27 -0400 (Mon, 18 May 2009)
New Revision: 26595

Modified:
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityReaper.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ReaperThread.java
   labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/XTSService.java
Log:
added shutdown method for Activity Service and hooked it into XTS Service shutdown

Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityReaper.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityReaper.java	2009-05-18 15:19:52 UTC (rev 26594)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ActivityReaper.java	2009-05-18 15:24:27 UTC (rev 26595)
@@ -83,7 +83,7 @@
     /**
      * Only check for one at a time to prevent starvation.
      *
-     * Timeout is given in milliseconds.
+     * Timeout is given in millisecon>ds.
      *
      * @message com.arjuna.mwlabs.wsas.activity.ActivityReaper_1 [com.arjuna.mwlabs.wsas.activity.ActivityReaper_1] - ActivityReaper: could not terminate.
      */
@@ -284,12 +284,16 @@
 	    return _theReaper;
     }
 
-    /*
-     * Don't bother synchronizing as this is only an estimate anyway.
+    /**
+     * make sure the reaper thread exits
      */
+    public static synchronized void shutdown()
+    {
+        if (_theReaper != null) {
+            _reaperThread.shutdown();
+        }
+    }
 
-    public static final long defaultCheckPeriod = 120000;  // in milliseconds
-
     ActivityReaper ()
     {
         _list = new TreeSet<ReaperElement>();

Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ReaperThread.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ReaperThread.java	2009-05-18 15:19:52 UTC (rev 26594)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mwlabs/wsas/activity/ReaperThread.java	2009-05-18 15:24:27 UTC (rev 26595)
@@ -92,6 +92,7 @@
     public synchronized void shutdown ()
     {
         _shutdown = true;
+        notify();
     }
 
     private ActivityReaper _reaperObject;

Modified: labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/XTSService.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/XTSService.java	2009-05-18 15:19:52 UTC (rev 26594)
+++ labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/XTSService.java	2009-05-18 15:24:27 UTC (rev 26595)
@@ -77,6 +77,7 @@
 //import com.arjuna.wst.messaging.*;
 import com.arjuna.ats.arjuna.recovery.RecoveryManager;
 import com.arjuna.webservices.util.TransportTimer;
+import com.arjuna.mwlabs.wsas.activity.ActivityReaper;
 
 import javax.management.MBeanServer;
 import java.net.InetAddress;
@@ -347,6 +348,10 @@
 
         TaskManager.getManager().shutdown() ; // com.arjuna.services.framework.admin.TaskManagerInitialisation
 
+        // shutdown the activity service reaper
+
+        ActivityReaper.shutdown();
+        
         /*
          * this will be done by the servlet shutdown code
         // HttpClientInitialisation