From jboss-cvs-commits at lists.jboss.org Wed Mar 11 14:27:40 2015 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 11 Mar 2015 14:27:40 -0400 Subject: [jboss-cvs] JBossAS SVN: r114835 - branches. Message-ID: <201503111827.t2BIReo2015510@svn01.web.mwc.hst.phx2.redhat.com> Author: jolee Date: 2015-03-11 14:27:39 -0400 (Wed, 11 Mar 2015) New Revision: 114835 Added: branches/JBPAPP_5_1_2_GA_JBPAPP-11215/ Log: JBPAPP-11215 From jboss-cvs-commits at lists.jboss.org Thu Mar 12 21:06:26 2015 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 12 Mar 2015 21:06:26 -0400 Subject: [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. Message-ID: <201503130106.t2D16QMU002562@svn01.web.mwc.hst.phx2.redhat.com> 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)