[jboss-svn-commits] JBL Code SVN: r29560 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx: jts and 1 other directory.

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

Author: jhalliday
Date: 2009-10-08 11:48:36 -0400 (Thu, 08 Oct 2009)
New Revision: 29560

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java
Log:
Ported recovery manager properties loading fix to 4.6.1.CP branch. JBTM-598


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java	2009-10-08 14:57:27 UTC (rev 29559)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java	2009-10-08 15:48:36 UTC (rev 29560)
@@ -174,6 +174,10 @@
 
         log.info("Setting up property manager MBean and JMX layer");
 
+        // recovery manager properties must be installed before the tx system is initialized. JBTM-598
+        arjPropertyManager.propertyManager = PropertyManagerFactory.getPropertyManager("com.arjuna.ats.propertymanager", "recoverymanager");
+        Utility.getpid(); // socketProcessId needs to own the port, not the tsm. yuck.
+
         /** Set the tsmx agent implementation to the local JBOSS agent impl **/
         LocalJBossAgentImpl.setLocalAgent( getMbeanServer() );
         System.setProperty(com.arjuna.ats.tsmx.TransactionServiceMX.AGENT_IMPLEMENTATION_PROPERTY,

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java	2009-10-08 14:57:27 UTC (rev 29559)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java	2009-10-08 15:48:36 UTC (rev 29560)
@@ -183,6 +183,10 @@
 
         log.info("Setting up property manager MBean and JMX layer");
 
+        // recovery manager properties must be installed before the tx system is initialized. JBTM-598
+        arjPropertyManager.propertyManager = PropertyManagerFactory.getPropertyManager("com.arjuna.ats.propertymanager", "recoverymanager");
+        Utility.getpid(); // socketProcessId needs to own the port, not the tsm. yuck.
+        
         /** Set the tsmx agent implementation to the local JBOSS agent impl **/
         LocalJBossAgentImpl.setLocalAgent( getMbeanServer() );
         System.setProperty(com.arjuna.ats.tsmx.TransactionServiceMX.AGENT_IMPLEMENTATION_PROPERTY,