[jboss-svn-commits] JBL Code SVN: r34571 - in labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance: managed/localtx and 1 other directory.

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

Author: whitingjr
Date: 2010-08-06 07:41:32 -0400 (Fri, 06 Aug 2010)
New Revision: 34571

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/connectionmanager/LocalTXCachedDataSource.java
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/managed/localtx/LocalTXWrappedConnection.java
Log:
Updated the cached connection for local tx resource handling.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/connectionmanager/LocalTXCachedDataSource.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/connectionmanager/LocalTXCachedDataSource.java	2010-08-06 11:38:54 UTC (rev 34570)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/connectionmanager/LocalTXCachedDataSource.java	2010-08-06 11:41:32 UTC (rev 34571)
@@ -31,6 +31,8 @@
 import javax.resource.spi.ManagedConnectionFactory;
 
 import org.apache.commons.lang.reflect.FieldUtils;
+import org.jboss.jbossts.performance.managed.localtx.LocalTXWrappedConnection;
+import org.jboss.resource.adapter.jdbc.WrappedConnection;
 import org.jboss.resource.adapter.jdbc.local.LocalTxDataSource;
 import org.jboss.resource.connectionmanager.TxConnectionManager;
 
@@ -68,21 +70,33 @@
       {
          if (null == this.cachedConnection.get())
          {
-            this.cachedConnection.set(txConnManager.allocateConnection(mcf, cxRequestInfo));
+            LocalTXWrappedConnection wrappedConnection = new LocalTXWrappedConnection((WrappedConnection) txConnManager.allocateConnection(mcf, cxRequestInfo)); 
+            this.cachedConnection.set(wrappedConnection);
          }
          try
          {
             if (((Connection)this.cachedConnection.get()).isClosed())
             {/* renew the connection, the previous user of the connection really did want to close the
-            connection object. */
-               this.cachedConnection.set(txConnManager.allocateConnection(mcf, cxRequestInfo));
+               connection object. */
+               LocalTXWrappedConnection wrappedConnection = new LocalTXWrappedConnection((WrappedConnection) txConnManager.allocateConnection(mcf, cxRequestInfo)); 
+               this.cachedConnection.set(wrappedConnection);
             }
          }
          catch (Exception e)
          {
             throw new ResourceException(e);
          }
-         return this.cachedConnection.get(); 
+         return this.cachedConnection.get();
       }
    }
+   
+   @Override
+   public Object getDatasource()
+   {
+      return super.getDatasource();
+   }
+   public TxConnectionManager getTxConnManager()
+   {
+      return this.txConnManager;
+   }
 }

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/managed/localtx/LocalTXWrappedConnection.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/managed/localtx/LocalTXWrappedConnection.java	2010-08-06 11:38:54 UTC (rev 34570)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/managed/localtx/LocalTXWrappedConnection.java	2010-08-06 11:41:32 UTC (rev 34571)
@@ -32,19 +32,23 @@
 import java.util.Map;
 
 import org.jboss.jbossts.performance.managed.AbstractCachedConnectionWrapper;
-import org.jboss.resource.adapter.jdbc.BaseWrapperManagedConnection;
 import org.jboss.resource.adapter.jdbc.WrappedConnection;
 import org.jboss.resource.adapter.jdbc.WrapperDataSource;
 
 public class LocalTXWrappedConnection extends AbstractCachedConnectionWrapper
 {
+   private ThreadLocal<CachedLocalTxManagedConnection> managedConnectionLocal = new ThreadLocal<CachedLocalTxManagedConnection>();
    
-   public LocalTXWrappedConnection(final BaseWrapperManagedConnection mc, final WrappedConnection conn)
+   public LocalTXWrappedConnection( final WrappedConnection conn)
    {
       super(null, conn);
       this.connection = conn;
    }
 
+   public CachedLocalTxManagedConnection getManagedConnection()
+   {
+      return managedConnectionLocal.get();
+   }
    @Override
    public void clearWarnings() throws SQLException
    {
@@ -272,6 +276,7 @@
    @Override
    protected void releaseResources()
    {
+      
    }
    
 }