[Jboss-cvs] JBossAS SVN: r57096 - trunk/connector/src/main/org/jboss/resource/connectionmanager

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

Author: weston.price at jboss.com
Date: 2006-09-22 22:31:04 -0400 (Fri, 22 Sep 2006)
New Revision: 57096

Modified:
   trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java
Log:
[JBAS-3183] [JBAS-1405] [JBAS-397] Continued work on XAResourceWrapper and JcaXid. Moving
previous handling of Xid padding and isSameRM from XidFactory and
BaseWrapperManagedConnectionFactory respectively. 

Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	2006-09-23 02:30:39 UTC (rev 57095)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	2006-09-23 02:31:04 UTC (rev 57096)
@@ -47,6 +47,7 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.resource.JBossResourceException;
+import org.jboss.resource.connectionmanager.xa.XAResourceWrapper;
 import org.jboss.tm.LastResource;
 import org.jboss.tm.TransactionTimeoutConfiguration;
 import org.jboss.tm.TxUtils;
@@ -363,15 +364,20 @@
       throws ResourceException
    {
       XAResource xaResource = null;
+      
       if (localTransactions)
       {
          xaResource = new LocalXAResource(log);
          if (xaResourceTimeout != 0)
             log.debug("XAResource transaction timeout cannot be set for local transactions: " + getJndiName());
       }
+      
       else
       {
-         xaResource = mc.getXAResource();
+         
+         //Should we allow complete ignore?
+         xaResource = new XAResourceWrapper(false, padXid, mc.getXAResource());
+         
          if (xaResourceTimeout != 0)
          {
             try