[jboss-cvs] JBossAS SVN: r60866 - branches/Branch_4_2/server/src/main/org/jboss/invocation/jrmp/server.

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

Author: bstansberry at jboss.com
Date: 2007-02-23 21:36:51 -0500 (Fri, 23 Feb 2007)
New Revision: 60866

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/invocation/jrmp/server/JRMPInvoker.java
Log:
[JBAS-4116] JRMPInvoker does not cache TransactionPropagationContextImporter

Modified: branches/Branch_4_2/server/src/main/org/jboss/invocation/jrmp/server/JRMPInvoker.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/invocation/jrmp/server/JRMPInvoker.java	2007-02-24 02:35:55 UTC (rev 60865)
+++ branches/Branch_4_2/server/src/main/org/jboss/invocation/jrmp/server/JRMPInvoker.java	2007-02-24 02:36:51 UTC (rev 60866)
@@ -57,7 +57,6 @@
 import org.jboss.security.SecurityDomain;
 import org.jboss.system.Registry;
 import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.tm.TransactionPropagationContextImporter;
 import org.jboss.tm.TransactionPropagationContextUtil;
 
 /**
@@ -136,8 +135,6 @@
     */
    private MBeanServerAction serverAction = new MBeanServerAction();
 
-   private static TransactionPropagationContextImporter tpcImporter;
-
    public JRMPInvoker()
    {
       final JRMPInvoker delegate = this;
@@ -356,11 +353,10 @@
 
       InitialContext ctx = new InitialContext();
 
-      // FIXME marcf: This should not be here
-      // and the transaction propagation context importer
-      tpcImporter = TransactionPropagationContextUtil.getTPCImporter();
+      // Validate that there is a TransactionPropagationContextImporter
+      // bound in JNDI
+      TransactionPropagationContextUtil.getTPCImporter();
 
-
       // Set the transaction manager and transaction propagation
       // context factory of the GenericProxy class
 
@@ -592,7 +588,7 @@
    protected Transaction importTPC(Object tpc)
    {
       if (tpc != null)
-         return tpcImporter.importTransactionPropagationContext(tpc);
+         return TransactionPropagationContextUtil.importTPC(tpc);
       return null;
    }