[CONJ-884] connection.isValid error firing connectionErrorOccurred

mariadb-corporation · Jul 26, 2021 · 1056012 · 1056012
1 parent 877c4e3
commit 1056012
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbConnection.java b/src/main/java/org/mariadb/jdbc/MariaDbConnection.java
@@ -1227,7 +1227,11 @@ public boolean isValid(final int timeout) throws SQLException {
     try {
       return protocol.isValid(timeout * 1000);
     } catch (SQLException e) {
-      // eat
+      if (pooledConnection != null) {
+        MariaDbPooledConnection poolConnection = this.pooledConnection;
+        poolConnection.fireConnectionErrorOccurred(e);
+        poolConnection.close();
+      }
       return false;
     }
   }

diff --git a/src/main/java/org/mariadb/jdbc/internal/util/pool/Pool.java b/src/main/java/org/mariadb/jdbc/internal/util/pool/Pool.java
@@ -287,8 +287,6 @@ private MariaDbPooledConnection getIdleConnection(long timeout, TimeUnit timeUni
           // eat
         }
 
-        totalConnection.decrementAndGet();
-
         // validation failed
         silentAbortConnection(item);
         addConnectionRequest();