[jboss-cvs] JBossAS SVN: r63063 - projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins.

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

Author: anil.saldhana at jboss.com
Date: 2007-05-15 16:17:22 -0400 (Tue, 15 May 2007)
New Revision: 63063

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/TransactionManagerLocator.java
Log:
correct jboss tm name

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/TransactionManagerLocator.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/TransactionManagerLocator.java	2007-05-15 20:17:03 UTC (rev 63062)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/TransactionManagerLocator.java	2007-05-15 20:17:22 UTC (rev 63063)
@@ -24,9 +24,12 @@
 import java.lang.reflect.Method;
 
 import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 import javax.transaction.TransactionManager;
 
+import org.jboss.logging.Logger;
+
 //$Id$
 
 /**
@@ -37,6 +40,8 @@
  */
 public class TransactionManagerLocator
 {
+   private static Logger log = Logger.getLogger(TransactionManagerLocator.class);
+   
    public TransactionManagerLocator()
    {   
    }
@@ -45,22 +50,28 @@
    {
       TransactionManager tm = null;
       InitialContext ctx = new InitialContext();
-      tm = (TransactionManager) ctx.lookup(jndiName);
-      if(tm == null)
+      try
+      { 
+         tm = (TransactionManager) ctx.lookup(jndiName);
+      }
+      catch(NameNotFoundException nfe)
+      {
          try
          {
             tm = this.getJBossTM();
          }
-         catch (Exception e)
+         catch (Exception ignore)
          { 
+            log.trace("Exception in getJBossTM:", ignore);
          }
+      } 
       return tm;
    } 
    
    private TransactionManager getJBossTM() throws Exception
    {
       ClassLoader tcl = SubjectActions.getContextClassLoader();
-      Class clz = tcl.loadClass("org.jboss.transaction.TXManager");
+      Class clz = tcl.loadClass("org.jboss.tm.TxManager");
       Method m = clz.getMethod("getInstance", new Class[]{});
       return (TransactionManager) m.invoke(null, new Object[0]); 
    }