[jboss-cvs] JBossAS SVN: r71906 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx.

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

Author: jesper.pedersen
Date: 2008-04-10 07:20:27 -0400 (Thu, 10 Apr 2008)
New Revision: 71906

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx/TxUtil.java
Log:
Remove InitialContext from critical path as it is not needed

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx/TxUtil.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx/TxUtil.java	2008-04-10 11:12:11 UTC (rev 71905)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx/TxUtil.java	2008-04-10 11:20:27 UTC (rev 71906)
@@ -24,8 +24,6 @@
 import javax.ejb.ApplicationException;
 import javax.ejb.TransactionManagement;
 import javax.ejb.TransactionManagementType;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.transaction.TransactionManager;
 
 import org.jboss.aop.Advisor;
@@ -33,7 +31,6 @@
 import org.jboss.aop.joinpoint.MethodInvocation;
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.InitialContextFactory;
 import org.jboss.ejb3.annotation.impl.ApplicationExceptionImpl;
 import org.jboss.ejb3.aop.AbstractInterceptor;
 import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
@@ -49,19 +46,9 @@
  */
 public class TxUtil
 {
-   public static TransactionManager getTransactionManager() throws RuntimeException
+   public static TransactionManager getTransactionManager()
    {
-      try
-      {
-         //return TxManager.getInstance();
-         InitialContext jndiContext = InitialContextFactory.getInitialContext();
-         TransactionManager tm = TransactionManagerLocator.getInstance().locate();
-         return tm;
-      } 
-      catch (NamingException e)
-      {
-         throw new RuntimeException("Unable to lookup TransactionManager", e);
-      }
+      return TransactionManagerLocator.getInstance().locate();
    }
 
    public static TransactionManagementType getTransactionManagementType(Advisor advisor)