[jboss-cvs] JBossAS SVN: r110061 - branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jdbc.

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

Author: jesper.pedersen
Date: 2010-12-21 04:45:37 -0500 (Tue, 21 Dec 2010)
New Revision: 110061

Modified:
   branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java
   branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java
Log:
[JBPAPP-5596] Potential dead-lock

Modified: branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java	2010-12-21 09:41:46 UTC (rev 110060)
+++ branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java	2010-12-21 09:45:37 UTC (rev 110061)
@@ -68,7 +68,7 @@
    private final int transactionIsolation;
    private final boolean readOnly;
 
-   private ReentrantLock lock = new ReentrantLock();
+   private ReentrantLock lock = new ReentrantLock(true);
    
    private final Collection cels = new ArrayList();
    private final Set handles = new HashSet();
@@ -202,7 +202,7 @@
          // because it looks too nasty to expect the connection handle
          // to unlock properly in certain race conditions
          // where the dissociation of the managed connection is "random".
-         lock = new ReentrantLock();
+         lock = new ReentrantLock(true);
       }
    }
 
@@ -276,7 +276,8 @@
    
    protected void unlock()
    {
-      lock.unlock();
+      if (lock.isHeldByCurrentThread())
+         lock.unlock();
    }
    
    void closeHandle(WrappedConnection handle)

Modified: branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java	2010-12-21 09:41:46 UTC (rev 110060)
+++ branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java	2010-12-21 09:45:37 UTC (rev 110061)
@@ -50,7 +50,9 @@
 {
    private static final Logger log = Logger.getLogger(WrappedConnection.class);
 
-   private BaseWrapperManagedConnection mc;
+   private volatile BaseWrapperManagedConnection mc;
+   private BaseWrapperManagedConnection lockedMC;
+   private int lockCount;
 
    private WrapperDataSource dataSource;
    
@@ -78,18 +80,25 @@
    {
       BaseWrapperManagedConnection mc = this.mc;
       if (mc != null)
+      {
          mc.tryLock();
+         if (lockedMC == null)
+            lockedMC = mc;
+
+         lockCount++ ;
+      }
       else
          throw new SQLException("Connection is not associated with a managed connection." + this);
    }
 
    protected void unlock()
    {
-      BaseWrapperManagedConnection mc = this.mc;
+      BaseWrapperManagedConnection mc = this.lockedMC;
+      if (--lockCount == 0)
+         lockedMC = null;
+
       if (mc != null)
          mc.unlock();
-      // We recreate the lock when returned to the pool
-      // so missing the unlock after disassociation is not important
    }
    
    public WrapperDataSource getDataSource()