Fix for Bug#107094 (Bug#34104230), NullPointerException when calling equals with null on MultiHostConnectionProxy.

Change-Id: I47e30464eda0f86a347ab43efc67daef32ad2e81

Author: fjssilva

CHANGES

@@ -3,6 +3,8 @@
 
 Version 9.5.0
 
+  - Fix for Bug#107094 (Bug#34104230), NullPointerException when calling equals with null on MultiHostConnectionProxy.
+
   - Fix for Bug#107543 (Bug#34464351), Cannot execute a SELECT statement that writes to an OUTFILE.
 
   - Fix for Bug#17881458, BEHAVIOR OF SETBINARYSTREAM() METHOD IS DIFFERENT WHEN USESERVERPREPSTMTS=TRUE.

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

@@ -482,6 +482,9 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
         }
 
         if (METHOD_EQUALS.equals(methodName)) {
+            if (args[0] == null) {
+                return false;
+            }
             // Let args[0] "unwrap" to its InvocationHandler if it is a proxy.
             return args[0].equals(this);
         }

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

@@ -12447,4 +12447,30 @@ void testBug44791() throws Exception {
         } while (useSPS = !useSPS);
     }
 
+    /**
+     * Tests fix for Bug#107094 (Bug#34104230), NullPointerException when calling equals with null on MultiHostConnectionProxy.
+     *
+     * @throws Exception
+     */
+    @Test
+    void testBug107094() throws Exception {
+        assertTrue(this.conn.equals(this.conn));
+        assertFalse(this.conn.equals(null));
+
+        try (Connection testConn = getFailoverConnection()) {
+            assertTrue(testConn.equals(testConn));
+            assertFalse(testConn.equals(null));
+        }
+
+        try (Connection testConn = getLoadBalancedConnection()) {
+            assertTrue(testConn.equals(testConn));
+            assertFalse(testConn.equals(null));
+        }
+
+        try (Connection testConn = getSourceReplicaReplicationConnection()) {
+            assertTrue(testConn.equals(testConn));
+            assertFalse(testConn.equals(null));
+        }
+    }
+
 }