[jboss-svn-commits] JBL Code SVN: r34423 - labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/xa/managed.

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

Author: whitingjr
Date: 2010-07-30 11:58:29 -0400 (Fri, 30 Jul 2010)
New Revision: 34423

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/xa/managed/XAWrappedConnection.java
Log:
Changed object for abstracting control of the connections.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/xa/managed/XAWrappedConnection.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/xa/managed/XAWrappedConnection.java	2010-07-30 15:57:37 UTC (rev 34422)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/xa/managed/XAWrappedConnection.java	2010-07-30 15:58:29 UTC (rev 34423)
@@ -23,7 +23,6 @@
 package org.jboss.jbossts.performance.xa.managed;
 
 import java.sql.CallableStatement;
-import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -37,7 +36,7 @@
 import javax.transaction.xa.XAResource;
 
 import org.apache.log4j.Logger;
-import org.jboss.resource.adapter.jdbc.BaseWrapperManagedConnection;
+import org.jboss.jbossts.performance.managed.AbstractCachedConnectionWrapper;
 import org.jboss.resource.adapter.jdbc.WrappedConnection;
 import org.jboss.resource.adapter.jdbc.WrapperDataSource;
 
@@ -54,7 +53,7 @@
  * @author <a href="jwhiting at redhat.com">Jeremy Whiting</a>
  * @version $Revision: 1.1 $
  */
-public class XAWrappedConnection extends WrappedConnection
+public class XAWrappedConnection extends AbstractCachedConnectionWrapper
 {
    /**
     * This holds a reference to the resource manager.
@@ -64,7 +63,6 @@
     * A reference to the connection we are wrapping. All the methods pass through 
     * to this object.
     */
-   private WrappedConnection connection;
    
    private ThreadLocal<CachedXAManagedConnection> managedConnectionLocal = new ThreadLocal<CachedXAManagedConnection>();
    
@@ -72,8 +70,7 @@
    
    public XAWrappedConnection(WrappedConnection wrappedConn, XAResource xaRes, CachedXAManagedConnection managed)
    {
-      super(null);
-      this.connection = wrappedConn;
+      super(null, wrappedConn);
       this.xaResLocal.set(xaRes);
       this.managedConnectionLocal.set( managed);
    }
@@ -103,7 +100,6 @@
       /** Rather than close the undelying connection it remains open to be reused by the 
        * same thread of control.
        */
-//      this.connection.close();
       /**
        * Here the connection is delisted from the transaction.
        */
@@ -333,30 +329,6 @@
       // FIXME setTransactionIsolation
       this.connection.setTransactionIsolation(level);
    }
-
-//   @Override
-//   public void setTypeMap(Map<String, Class<?>> map) throws SQLException
-//   {
-//      // FIXME setTypeMap
-//      this.connection.setTypeMap(map);
-//   }
-//
-//   @Override
-//   public <T> T unwrap(Class<T> iface) throws SQLException
-//   {
-//      // FIXME unwrap
-//      return this.connection.unwrap(iface);
-//   }
-
-   /**
-    * This constructor is purely to satisfy the compiler and is not intended 
-    * for use.
-    * @param mc 
-    */
-   public XAWrappedConnection(final BaseWrapperManagedConnection mc)
-   {
-      super(mc);
-   }
    
    @Override
    protected void setDataSource(WrapperDataSource dataSource)
@@ -365,8 +337,11 @@
       super.setDataSource(dataSource);
    }
    
-   public Connection getWrappedConnection()
+   
+   @Override
+   protected void releaseResources()
    {
-      return this.connection;
+      this.xaResLocal.set(null);
+      this.managedConnectionLocal.set(null);
    }
 }