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

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

Author: jesper.pedersen
Date: 2012-02-08 13:49:38 -0500 (Wed, 08 Feb 2012)
New Revision: 112626

Modified:
   projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java
Log:
Add ironjacamar.jdbc.ignoreautocommit

Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java	2012-02-07 14:47:51 UTC (rev 112625)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java	2012-02-08 18:49:38 UTC (rev 112626)
@@ -105,6 +105,9 @@
    /** JDBC auto-commit */
    protected boolean jdbcAutoCommit = true;
 
+   /** Ignore in managed auto commit calls */
+   protected static boolean ignoreInManagedAutoCommitCalls = false;
+
    /** Underlying auto-commit */
    protected boolean underlyingAutoCommit = true;
 
@@ -150,6 +153,10 @@
       {
          throw new RuntimeException("Error initializign connection factory", e);
       }
+
+      String ignAutoCommit = SecurityActions.getSystemProperty("ironjacamar.jdbc.ignoreautocommit");
+      if (ignAutoCommit != null)
+         ignoreInManagedAutoCommitCalls = Boolean.valueOf(ignAutoCommit);
    }
 
    /**
@@ -875,7 +882,16 @@
       synchronized (stateLock)
       {
          if (inManagedTransaction)
-            throw new SQLException("You cannot set autocommit during a managed transaction!");
+         {
+            if (!ignoreInManagedAutoCommitCalls)
+            {
+               throw new SQLException("You cannot set autocommit during a managed transaction!");
+            }
+            else
+            {
+               return;
+            }
+         }
 
          this.jdbcAutoCommit = jdbcAutoCommit;
       }