[jboss-cvs] JBossAS SVN: r57137 - branches/Branch_4_0/connector/src/main/org/jboss/resource/adapter/jdbc/xa

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

Author: weston.price at jboss.com
Date: 2006-09-25 12:20:00 -0400 (Mon, 25 Sep 2006)
New Revision: 57137

Modified:
   branches/Branch_4_0/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java
Log:
[JBAS-3693] Do not return managed connection to the pool on XAResource.end
failure. 

Modified: branches/Branch_4_0/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java
===================================================================
--- branches/Branch_4_0/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java	2006-09-25 16:00:07 UTC (rev 57136)
+++ branches/Branch_4_0/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java	2006-09-25 16:20:00 UTC (rev 57137)
@@ -142,7 +142,17 @@
 
    public void end(Xid xid, int flags) throws XAException
    {
-      xaResource.end(xid, flags);
+      try
+      {
+         xaResource.end(xid, flags);
+         
+      }catch(XAException e)
+      {
+         getLog().error("End transaction failed for XAResource", e);         
+         broadcastConnectionError(e);
+         throw e;
+      }
+
       //we want to allow ending transactions that are not the current
       //one. When one does this, inManagedTransaction is still true.
       synchronized (stateLock)