[jboss-cvs] JBossAS SVN: r111642 - branches/JBPAPP_5_1_0_Final_JBPAPP-6742/connector/src/main/org/jboss/resource/adapter/jdbc.

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

Author: jesper.pedersen
Date: 2011-06-20 13:30:46 -0400 (Mon, 20 Jun 2011)
New Revision: 111642

Modified:
   branches/JBPAPP_5_1_0_Final_JBPAPP-6742/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java
Log:
[JBPAPP-6742] Add comment about why we reset

Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-6742/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-6742/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java	2011-06-20 04:39:11 UTC (rev 111641)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-6742/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java	2011-06-20 17:30:46 UTC (rev 111642)
@@ -63,18 +63,23 @@
    
    public WrappedConnection(final BaseWrapperManagedConnection mc)
    {
-      this.mc = mc;
-      if (mc != null)
-         trackStatements = mc.getTrackStatements();
+      setManagedConnection(mc);
    }
 
    void setManagedConnection(final BaseWrapperManagedConnection mc)
    {
       this.mc = mc;
+      this.lockCount = 0;
+
       if (mc != null)
+      {
          trackStatements = mc.getTrackStatements();
+      }
       else
+      {
+         // Reset lockedMC once it is returned to the pool
          lockedMC = null;
+      }
    }
 
    protected void lock() throws SQLException
@@ -84,7 +89,7 @@
       {
          mc.tryLock();
          if (lockedMC == null)
-            lockedMC = mc ;
+            lockedMC = mc;
 
          lockCount++;
       }