[jboss-cvs] JBossAS SVN: r75071 - branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc.

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

Author: adrian at jboss.org
Date: 2008-06-25 12:33:39 -0400 (Wed, 25 Jun 2008)
New Revision: 75071

Modified:
   branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java
Log:
[JBAS-5678] - Always make sure we rollback before a close when autocommit is off

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java	2008-06-25 16:23:53 UTC (rev 75070)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java	2008-06-25 16:33:39 UTC (rev 75071)
@@ -229,6 +229,16 @@
       cleanup();
       try
       {
+         // See JBAS-5678
+         if (underlyingAutoCommit == false)
+            con.rollback();
+      }
+      catch (SQLException ignored)
+      {
+         getLog().trace("Ignored error during rollback: ", ignored);
+      }
+      try
+      {
          con.close();
       }
       catch (SQLException ignored)