svn commit: r1332443 - in /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl: BaseGenericObjectPool.java GenericKeyedObjectPool.java GenericObjectPool.java

[markt]

Author: markt
Date: Mon Apr 30 22:10:12 2012
New Revision: 1332443

URL: http://svn.apache.org/viewvc?rev=1332443&view=rev
Log:
Pull up closeLock

Modified:
    
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
    
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
    
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java

Modified: 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java?rev=1332443&r1=1332442&r2=1332443&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
 (original)
+++ 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
 Mon Apr 30 22:10:12 2012
@@ -86,6 +86,7 @@ public abstract class BaseGenericObjectP
 
 
     // Internal (primarily state) attributes
+    final Object closeLock = new Object();
     volatile boolean closed = false;
     final Object evictionLock = new Object();
     private Evictor evictor = null; // @GuardedBy("evictionLock")

Modified: 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1332443&r1=1332442&r2=1332443&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
 (original)
+++ 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
 Mon Apr 30 22:10:12 2012
@@ -1655,9 +1655,6 @@ public class GenericKeyedObjectPool<K,T>
      */
     private K evictionKey = null; // @GuardedBy("evictionLock")
 
-    /** Object used to ensure closed() is only called once. */
-    private final Object closeLock = new Object();
-
     // JMX specific attributes
     private final ObjectName oname;
 

Modified: 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1332443&r1=1332442&r2=1332443&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
 (original)
+++ 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
 Mon Apr 30 22:10:12 2012
@@ -959,9 +959,6 @@ public class GenericObjectPool<T> extend
     private final LinkedBlockingDeque<PooledObject<T>> idleObjects =
         new LinkedBlockingDeque<PooledObject<T>>();
 
-    /** Object used to ensure closed() is only called once. */
-    private final Object closeLock = new Object();
-
     // JMX specific attributes
     private final ObjectName oname;