[jboss-cvs] JBossAS SVN: r114716 - projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa.

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

Author: jolee
Date: 2014-02-12 16:20:59 -0500 (Wed, 12 Feb 2014)
New Revision: 114716

Modified:
   projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnection.java
Log:
BZ1063924: (JBJCA-1101) XAException::XA_RB?\226?\136?\151 isn't fatal

Modified: projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnection.java
===================================================================
--- projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnection.java	2014-02-12 21:06:52 UTC (rev 114715)
+++ projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnection.java	2014-02-12 21:20:59 UTC (rev 114716)
@@ -296,7 +296,10 @@
          }
          catch (XAException e)
          {
-            broadcastConnectionError(e);
+            if (isFailedXA(e.errorCode))
+            {
+               broadcastConnectionError(e);
+            }
             throw e;
          }
 
@@ -393,7 +396,7 @@
    
    private boolean isFailedXA(int errorCode)
    {
-      return (errorCode == XAException.XAER_RMERR || errorCode == XAException.XAER_RMFAIL);      
+      return !(errorCode >= XAException.XA_RBBASE && errorCode < XAException.XA_RBEND);      
    }
 
    /**