[jboss-cvs] JBossAS SVN: r57752 - branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/xa

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

Author: weston.price at jboss.com
Date: 2006-10-20 01:00:14 -0400 (Fri, 20 Oct 2006)
New Revision: 57752

Modified:
   branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/xa/JcaXAResourceWrapper.java
Log:
[JBAS-3183] [JBAS-1405] Added JcaXAResourceWrapped and JcaXid to support 
thirdparty integration as well as Xid padding in JCA layer.

Modified: branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/xa/JcaXAResourceWrapper.java
===================================================================
--- branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/xa/JcaXAResourceWrapper.java	2006-10-20 04:59:19 UTC (rev 57751)
+++ branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/xa/JcaXAResourceWrapper.java	2006-10-20 05:00:14 UTC (rev 57752)
@@ -42,7 +42,6 @@
    private final boolean pad;
    private final XAResource resource;
    private Boolean overrideSameRM;
-   private boolean convertXid;
   
    public JcaXAResourceWrapper(final XAResource resource, final boolean pad, final Boolean overrideSameRM)
    {
@@ -132,7 +131,7 @@
          throw e;
       }
       
-      return (convertXid && xid instanceof JcaXid) ? xid : new JcaXid(xid, pad);
+      return (xid instanceof JcaXid) ? xid : new JcaXid(xid, pad);
    
    }