[jboss-cvs] JBossAS SVN: r57135 - trunk/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 11:59:38 -0400 (Mon, 25 Sep 2006)
New Revision: 57135

Modified:
   trunk/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java
Log:
[JBAS-3693] Do not return managed connection to pool in the case of an exception
on XAResource.end().

Modified: trunk/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java	2006-09-25 13:41:52 UTC (rev 57134)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java	2006-09-25 15:59:38 UTC (rev 57135)
@@ -142,7 +142,19 @@
 
    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)