[jbpm-commits] JBoss JBPM SVN: r5075 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-06-22 09:40:41 -0400 (Mon, 22 Jun 2009)
New Revision: 5075

Modified:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransaction.java
Log:
Lookup jboss user tx and fallback to default JEE JNDI name

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransaction.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransaction.java	2009-06-22 12:39:57 UTC (rev 5074)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransaction.java	2009-06-22 13:40:41 UTC (rev 5075)
@@ -37,6 +37,7 @@
  */
 public class JtaTransaction implements Transaction {
 
+  protected String jbossUserTransactionJndiName = "UserTransaction";
   protected String userTransactionJndiName = "java:comp/UserTransaction";
   protected String transactionManagerJndiName = "java:/TransactionManager";
 
@@ -107,7 +108,20 @@
   // lookups //////////////////////////////////////////////////////////////////
   
   public UserTransaction lookupJeeUserTransaction() {
-    return (UserTransaction) lookupFromJndi(userTransactionJndiName);
+    Object tx;
+
+    try
+    {
+      // non jee context, i.e. JBPMDeployer (jboss only)
+      tx = lookupFromJndi(jbossUserTransactionJndiName);
+    }
+    catch (JbpmException e)
+    {
+      // jee components
+      tx = lookupFromJndi(userTransactionJndiName);
+    }
+
+    return (UserTransaction) tx;
   }
 
   public javax.transaction.Transaction lookupJeeTransaction() {