#899 Backport to Jaybird 5: usage of FatalErrorHelper in FBPooledConnection

Author: mrotteveel

src/docs/asciidoc/release_notes.adoc

@@ -29,6 +29,13 @@ Changes per Jaybird 5 release.
 See also <<whats-new-in-jaybird-5>>.
 For known issues, consult <<known-issues>>.
 
+[#jaybird-5-0-11-changelog]
+=== Jaybird 5.0.11
+
+The following has been changed or fixed since Jaybird 5.0.10:
+
+* Backported fatal error detection improvements for `FBPooledConnection` from Jaybird 6 (https://github.com/FirebirdSQL/jaybird/issues/899[#899])
+
 [#jaybird-5-0-10-changelog]
 === Jaybird 5.0.10
 

src/main/org/firebirdsql/ds/FBPooledConnection.java

@@ -31,6 +31,7 @@
 import javax.sql.StatementEventListener;
 
 import org.firebirdsql.gds.ng.LockCloseable;
+import org.firebirdsql.jaybird.xca.FatalErrorHelper;
 import org.firebirdsql.jdbc.FBSQLException;
 import org.firebirdsql.jdbc.SQLStateConstants;
 
@@ -156,48 +157,14 @@ protected void fireFatalConnectionError(SQLException ex) {
     protected void fireConnectionError(SQLException ex) {
         SQLException currentException = ex;
         while (currentException != null) {
-            String sqlState = currentException.getSQLState();
-            if (isFatalState(sqlState)) {
+            if (FatalErrorHelper.isFatal(currentException)) {
                 fireFatalConnectionError(ex);
+                return;
             }
             currentException = ex.getNextException();
         }
     }
 
-    /**
-     * Decides if the given SQL state is a fatal connection error.
-     * 
-     * @param sqlState
-     *            SQL State value
-     * @return <code>true</code> if the SQL state is considered fatal
-     */
-    private boolean isFatalState(String sqlState) {
-        if (sqlState == null || sqlState.length() < 2) {
-            // No SQL State or no class specified, assume it's fatal
-            return true;
-        }
-        for (String fatalSqlStateClass : FATAL_SQL_STATE_CLASSES) {
-            if (sqlState.startsWith(fatalSqlStateClass)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static final String[] FATAL_SQL_STATE_CLASSES = {
-            // TODO double check firebird and Jaybird implementation for other states
-            "08", // Connection errors
-            "XX", // Internal errors
-            "01002", // Disconnect error
-            "01S00", // Invalid connection string attribute
-            "2D000", // Invalid transaction termination
-            "2E000", // Invalid connection name
-            "HY000", // General error (TODO: maybe too general?)
-            "HY001", // Memory allocation error
-            "HYT00", // Timeout expired
-            "HYT01", // Connection timeout expired
-    };
-
     /**
      * Helper method to fire the connectionClosed event.
      */