[jboss-cvs] JBossAS SVN: r109096 - in projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager: pool/idle and 2 other directories.

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

Author: jesper.pedersen
Date: 2010-11-03 13:52:48 -0400 (Wed, 03 Nov 2010)
New Revision: 109096

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/idle/IdleRemover.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/validator/ConnectionValidator.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java
Log:
Use fair locks

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java	2010-11-03 17:47:45 UTC (rev 109095)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java	2010-11-03 17:52:48 UTC (rev 109096)
@@ -28,7 +28,7 @@
 import org.jboss.jca.core.connectionmanager.tx.TxConnectionManagerImpl;
 import org.jboss.jca.core.connectionmanager.xa.LocalXAResource;
 
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.resource.ResourceException;
@@ -230,7 +230,7 @@
       }
 
       // Perform the enlistment(s)
-      CopyOnWriteArrayList<Synchronization> unenlisted = synchronizer.getUnenlisted();
+      List<Synchronization> unenlisted = synchronizer.getUnenlisted();
       if (unenlisted != null)
       {
          try

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/idle/IdleRemover.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/idle/IdleRemover.java	2010-11-03 17:47:45 UTC (rev 109095)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/idle/IdleRemover.java	2010-11-03 17:52:48 UTC (rev 109096)
@@ -64,7 +64,7 @@
    private long next = Long.MAX_VALUE;
    
    /**Lock for condition*/
-   private Lock lock = new ReentrantLock();
+   private Lock lock = new ReentrantLock(true);
    
    /**Condition*/
    private Condition condition = lock.newCondition();

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/validator/ConnectionValidator.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/validator/ConnectionValidator.java	2010-11-03 17:47:45 UTC (rev 109095)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/validator/ConnectionValidator.java	2010-11-03 17:52:48 UTC (rev 109096)
@@ -69,7 +69,7 @@
    private long next = Long.MAX_VALUE;
    
    /**Lock for condition*/
-   private Lock lock = new ReentrantLock();
+   private Lock lock = new ReentrantLock(true);
    
    /**Condition*/
    private Condition condition = lock.newCondition();

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java	2010-11-03 17:47:45 UTC (rev 109095)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java	2010-11-03 17:52:48 UTC (rev 109096)
@@ -21,6 +21,7 @@
  */
 package org.jboss.jca.core.connectionmanager.transaction;
 
+import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
@@ -71,7 +72,7 @@
    private Synchronization ccmSynch;
    
    /**Lock*/
-   private ReentrantLock lockObject = new ReentrantLock();
+   private ReentrantLock lockObject = new ReentrantLock(true);
    
    /**Condition*/
    private Condition condition = this.lockObject.newCondition();
@@ -111,7 +112,7 @@
     * 
     * @return the unenlisted synchronizations
     */
-   public CopyOnWriteArrayList<Synchronization> getUnenlisted()
+   public List<Synchronization> getUnenlisted()
    {
       Thread currentThread = Thread.currentThread();