Fix for Bug#72036 (Bug#18403804), XA isSameRM() shouldn't take database into account.

Change-Id: I99fdd11c63cfb6cf99077894f88649fb14a7a4b4

Author: fjssilva

CHANGES

@@ -3,6 +3,8 @@
 
 Version 9.5.0
 
+  - Fix for Bug#72036 (Bug#18403804), XA isSameRM() shouldn't take database into account.
+
   - Fix for Bug#62693 (Bug#16722068), XAConnection savepoint capability.
 
   - Fix for Bug#81128 (Bug#23146631), Master host list overwritten by slave list when loadBalanceConnectionGroup used.

src/main/user-impl/java/com/mysql/cj/jdbc/ConnectionImpl.java

@@ -1417,38 +1417,21 @@ public boolean isSameResource(JdbcConnection otherConnection) {
                 return false;
             }
 
-            boolean directCompare = true;
-
             String otherHost = ((ConnectionImpl) otherConnection).origHostToConnectTo;
-            String otherOrigDatabase = ((ConnectionImpl) otherConnection).origHostInfo.getDatabase();
-            String otherCurrentDb = ((ConnectionImpl) otherConnection).database;
-
-            if (!StringUtils.nullSafeEqual(otherHost, this.origHostToConnectTo)) {
-                directCompare = false;
-            } else if (otherHost != null && otherHost.indexOf(',') == -1 && otherHost.indexOf(':') == -1) {
-                // need to check port numbers
-                directCompare = ((ConnectionImpl) otherConnection).origPortToConnectTo == this.origPortToConnectTo;
-            }
-
-            if (directCompare) {
-                if (!StringUtils.nullSafeEqual(otherOrigDatabase, this.origHostInfo.getDatabase())
-                        || !StringUtils.nullSafeEqual(otherCurrentDb, this.database)) {
-                    directCompare = false;
-                }
+            if (StringUtils.nullSafeEqual(otherHost, this.origHostToConnectTo)) {
+                return true;
             }
 
-            if (directCompare) {
+            if (otherHost != null && otherHost.indexOf(',') == -1 && otherHost.indexOf(':') == -1 && // need to check port numbers
+                    ((ConnectionImpl) otherConnection).origPortToConnectTo == this.origPortToConnectTo) {
                 return true;
             }
 
             // Has the user explicitly set a resourceId?
             String otherResourceId = ((ConnectionImpl) otherConnection).getPropertySet().getStringProperty(PropertyKey.resourceId).getValue();
             String myResourceId = this.propertySet.getStringProperty(PropertyKey.resourceId).getValue();
-
             if (otherResourceId != null || myResourceId != null) {
-                directCompare = StringUtils.nullSafeEqual(otherResourceId, myResourceId);
-
-                if (directCompare) {
+                if (StringUtils.nullSafeEqual(otherResourceId, myResourceId)) {
                     return true;
                 }
             }

src/test/java/testsuite/BaseTestCase.java

@@ -44,14 +44,14 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
 
 import javax.net.ssl.SSLContext;
 
@@ -494,24 +494,18 @@ protected String getEncodedHostPortPairFromTestsuiteUrl() throws SQLException {
     }
 
     protected String getNoDbUrl(String url) throws SQLException {
+        return getReplacedDbUrl(url, "");
+    }
+
+    protected String getReplacedDbUrl(String url, String dbReplacement) throws SQLException {
         Properties props = getPropertiesFromUrl(ConnectionUrl.getConnectionUrlInstance(url, null));
         final String host = props.getProperty(PropertyKey.HOST.getKeyName(), "localhost");
         final String port = props.getProperty(PropertyKey.PORT.getKeyName(), "3306");
         props.remove(PropertyKey.DBNAME.getKeyName());
         removeHostRelatedProps(props);
 
-        final StringBuilder urlBuilder = new StringBuilder("jdbc:mysql://").append(host).append(":").append(port).append("/?");
-
-        Enumeration<Object> keyEnum = props.keys();
-        while (keyEnum.hasMoreElements()) {
-            String key = (String) keyEnum.nextElement();
-            urlBuilder.append(key);
-            urlBuilder.append("=");
-            urlBuilder.append(props.get(key));
-            if (keyEnum.hasMoreElements()) {
-                urlBuilder.append("&");
-            }
-        }
+        final StringBuilder urlBuilder = new StringBuilder("jdbc:mysql://").append(host).append(":").append(port).append("/").append(dbReplacement).append("?");
+        urlBuilder.append(props.stringPropertyNames().stream().map(k -> k + "=" + props.getProperty(k)).collect(Collectors.joining("&")));
         return urlBuilder.toString();
     }
 

src/test/java/testsuite/regression/ConnectionRegressionTest.java

@@ -12582,4 +12582,40 @@ public void testBug62693() throws Exception {
         }
     }
 
+    /**
+     * Tests fix for Bug#72036 (Bug#18403804), XA isSameRM() shouldn't take database into account.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testBug72036() throws Exception {
+        final String dbA = "testBug72036A";
+        final String dbB = "testBug72036B";
+        createDatabase(dbA);
+        createDatabase(dbB);
+
+        MysqlXADataSource xaDS = new MysqlXADataSource();
+        xaDS.getStringProperty(PropertyKey.sslMode.getKeyName()).setValue("DISABLED");
+        xaDS.getBooleanProperty(PropertyKey.allowPublicKeyRetrieval.getKeyName()).setValue(true);
+
+        xaDS.setUrl(getReplacedDbUrl(dbUrl, dbA));
+        XAConnection testXaConA1 = xaDS.getXAConnection();
+        XAResource testXaResA1 = testXaConA1.getXAResource();
+        assertEquals(dbA, testXaConA1.getConnection().getCatalog());
+
+        XAConnection testXaConA2 = xaDS.getXAConnection();
+        XAResource testXaResA2 = testXaConA2.getXAResource();
+        assertEquals(dbA, testXaConA2.getConnection().getCatalog());
+
+        assertTrue(testXaResA1.isSameRM(testXaResA2));
+
+        xaDS.setUrl(getReplacedDbUrl(dbUrl, dbB));
+        XAConnection testXaConB = xaDS.getXAConnection();
+        XAResource testXaResB = testXaConB.getXAResource();
+        assertEquals(dbB, testXaConB.getConnection().getCatalog());
+
+        assertTrue(testXaResA1.isSameRM(testXaResB));
+        assertTrue(testXaResA2.isSameRM(testXaResB));
+    }
+
 }