[CONJ-1189] XA START RESUME even with TMJOIN flag when using pinGloba…

…lTxToPhysicalConnection option
mariadb-corporation · Jul 10, 2024 · f68447f · f68447f
1 parent c2904a9
commit f68447f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbPoolPinnedConnection.java b/src/main/java/org/mariadb/jdbc/MariaDbPoolPinnedConnection.java
@@ -160,10 +160,19 @@ public boolean setTransactionTimeout(int i) {
 
     @Override
     public void start(Xid xid, int flags) throws XAException {
-      if (flags != TMJOIN && flags != TMRESUME && flags != TMNOFLAGS) {
-        throw new XAException(XAException.XAER_INVAL);
+      switch (flags) {
+        case TMJOIN:
+        case TMRESUME:
+          //  specific to pinGlobalTxToPhysicalConnection option set,
+          //  force resume in place of JOIN
+          execute(xid, "XA START " + xidToString(xid) + " RESUME", false);
+          break;
+        case TMNOFLAGS:
+          execute(xid, "XA START " + xidToString(xid), false);
+          break;
+        default:
+          throw new XAException(XAException.XAER_INVAL);
       }
-      execute(xid, "XA START " + xidToString(xid) + " " + flagsToString(flags), false);
     }
   }
 }
diff --git a/src/test/java/org/mariadb/jdbc/integration/XaTest.java b/src/test/java/org/mariadb/jdbc/integration/XaTest.java
@@ -81,6 +81,22 @@ public void testPinGlobalTxToPhysicalConnection() throws Exception {
     c2.getXAResource().commit(txid, false);
   }
 
+  @Test
+  public void testPinGlobalTxToPhysicalConnection2() throws Exception {
+
+    MariaDbDataSource xads = new MariaDbDataSource(mDefUrl + "&pinGlobalTxToPhysicalConnection");
+    Xid txid = new MariaDbXid(1, new byte[] {0xf}, new byte[] {0x01});
+
+    XAConnection c1 = xads.getXAConnection();
+    c1.getXAResource().start(txid, XAResource.TMNOFLAGS);
+    c1.getXAResource().end(txid, XAResource.TMSUCCESS);
+
+    XAConnection c2 = xads.getXAConnection();
+    c2.getXAResource().start(txid, XAResource.TMJOIN);
+    c2.getConnection().createStatement().executeQuery("SELECT 1");
+    c2.getXAResource().end(txid, XAResource.TMSUCCESS);
+  }
+
   @Test
   public void xaRmTest() throws Exception {
     MariaDbDataSource dataSource1 = new MariaDbDataSource(mDefUrl);