XA connection: after transaction commit or rollback, the physical connection is…

XA connection: after transaction commit or rollback, the physical connection is set into autocommit mode.

h2/src/main/org/h2/jdbcx/JdbcXAConnection.java

@@ -304,6 +304,7 @@ implements XAConnection, XAResource
         }
         try {
             physicalConn.rollback();
+            physicalConn.setAutoCommit(true);
         } catch (SQLException e) {
             throw convertException(e);
         }
@@ -384,6 +385,7 @@ implements XAConnection, XAResource
                 stat = physicalConn.createStatement();
                 stat.execute("COMMIT TRANSACTION TX_" + currentTransactionId);
             }
+            physicalConn.setAutoCommit(true);
         } catch (SQLException e) {
             throw convertException(e);
         } finally {

h2/src/test/org/h2/test/jdbcx/TestXA.java

@@ -38,6 +38,7 @@ public class TestXA extends TestBase {
     public void test() throws Exception {
         testXAAutoCommit();
         deleteDb("xa");
+        testMixedXaNormal();
         testXA(true);
         deleteDb(DB_NAME1);
         deleteDb(DB_NAME2);
@@ -47,6 +48,33 @@ public class TestXA extends TestBase {
         deleteDb(DB_NAME2);
     }
 
+    private void testMixedXaNormal() throws Exception {
+        JdbcDataSource ds = new JdbcDataSource();
+        ds.setURL("jdbc:h2:mem:test");
+        ds.setUser("sa");
+        ds.setPassword("");
+        XAConnection xa = ds.getXAConnection();
+        Connection c = xa.getConnection();
+        assertTrue(c.getAutoCommit());
+        MyXid xid = new MyXid();
+        XAResource res = xa.getXAResource();
+
+        res.start(xid, XAResource.TMNOFLAGS);
+        assertTrue(!c.getAutoCommit());
+        res.end(xid, XAResource.TMSUCCESS);
+        res.commit(xid, true);
+        assertTrue(c.getAutoCommit());
+
+        res.start(xid, XAResource.TMNOFLAGS);
+        assertTrue(!c.getAutoCommit());
+        res.end(xid, XAResource.TMFAIL);
+        res.rollback(xid);
+        assertTrue(c.getAutoCommit());
+
+        c.close();
+        xa.close();
+    }
+
     /**
      * A simple Xid implementation.
      */