[jboss-cvs] JBossAS SVN: r114836 - in branches/JBPAPP_5_1_2_GA_JBPAPP-11215/connector/src/main/org/jboss/resource/adapter/jdbc: vendor and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jolee
Date: 2015-03-12 21:06:25 -0400 (Thu, 12 Mar 2015)
New Revision: 114836

Modified:
   branches/JBPAPP_5_1_2_GA_JBPAPP-11215/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java
   branches/JBPAPP_5_1_2_GA_JBPAPP-11215/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/DB2ExceptionSorter.java
Log:
JBPAPP-11215

Modified: branches/JBPAPP_5_1_2_GA_JBPAPP-11215/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java
===================================================================
--- branches/JBPAPP_5_1_2_GA_JBPAPP-11215/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java	2015-03-11 18:27:39 UTC (rev 114835)
+++ branches/JBPAPP_5_1_2_GA_JBPAPP-11215/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java	2015-03-13 01:06:25 UTC (rev 114836)
@@ -826,10 +826,14 @@
          checkTransaction();
          return mc.getConnection();
       }
-      finally
-      {
+      catch (Throwable t)
+     {
+         throw checkException(t);
+     }
+     finally
+     {
          unlock();
-      }
+     }
    }
 
    protected Connection getWrappedObject() throws SQLException

Modified: branches/JBPAPP_5_1_2_GA_JBPAPP-11215/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/DB2ExceptionSorter.java
===================================================================
--- branches/JBPAPP_5_1_2_GA_JBPAPP-11215/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/DB2ExceptionSorter.java	2015-03-11 18:27:39 UTC (rev 114835)
+++ branches/JBPAPP_5_1_2_GA_JBPAPP-11215/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/DB2ExceptionSorter.java	2015-03-13 01:06:25 UTC (rev 114836)
@@ -58,6 +58,9 @@
       if(code == 4499)
       {
          isFatal = true;
+      } else if (code == 4470)
+      {
+	 isFatal = true;         
       }
       
       if(trace)