[jboss-svn-commits] JBL Code SVN: r27060 - labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta.

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

Author: adinn
Date: 2009-06-22 05:18:37 -0400 (Mon, 22 Jun 2009)
New Revision: 27060

Modified:
   labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
Log:
removed repeated init call for recovery manager and added missing guard test in start to match guard in create  -- fixes for JBTM-569

Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java	2009-06-21 07:04:01 UTC (rev 27059)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java	2009-06-22 09:18:37 UTC (rev 27060)
@@ -212,7 +212,8 @@
 
                 RecoveryManager.delayRecoveryManagerThread() ;
                 _recoveryManager = RecoveryManager.manager() ;
-                _recoveryManager.initialize();
+                // this is done in start()
+                // _recoveryManager.initialize();
 
                 log.info("Recovery manager configured");
             }
@@ -272,12 +273,15 @@
 
     public void start()
     {
+        if (_runRM)
+        {
         log.info("Starting transaction recovery manager");
 
         // TODO: any point in breaking out the recovery mgr into its own bean w/ own lifecycle?
         // may impact recovery config e.g. beans injection instead of XAResourceRecoveryRegistry lookup?
         _recoveryManager.initialize();
         _recoveryManager.startRecoveryManagerThread() ;
+        }
     }
 
     private boolean isRecoveryManagerRunning() throws Exception