[jboss-cvs] JBossAS SVN: r111010 - projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc.

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

Author: maeste
Date: 2011-03-23 12:31:29 -0400 (Wed, 23 Mar 2011)
New Revision: 111010

Modified:
   projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java
Log:
hacking on transactions, jndi and AS

Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java	2011-03-23 15:48:38 UTC (rev 111009)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java	2011-03-23 16:31:29 UTC (rev 111010)
@@ -66,6 +66,8 @@
    private Reference reference;
    private UserTransaction userTransaction;
 
+   private boolean initialized = false;
+
    /**
     * Constructor
     * @param mcf The managed connection factory
@@ -210,9 +212,22 @@
     */
    protected void checkTransactionActive() throws SQLException
    {
+      if (initialized && userTransaction == null)
+         return;
       if (userTransaction == null)
-         initUserTransaction();
-
+      {
+         try
+         {
+            initialized = true;
+            initUserTransaction();
+         }
+         catch (SQLException e)
+         {
+            // HACK
+            Logger.getLogger(this.getClass()).debugf("UserTransaction not found", e);
+            return;
+         }
+      }
       try
       {
          int status = userTransaction.getStatus();