You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2011/12/13 19:29:20 UTC
svn commit: r1213830 - in
/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl:
GenericKeyedObjectPool.java GenericObjectPool.java
Author: sebb
Date: Tue Dec 13 18:29:19 2011
New Revision: 1213830
URL: http://svn.apache.org/viewvc?rev=1213830&view=rev
Log:
Non-final locks are not very safe; make lock objects final
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1213830&r1=1213829&r2=1213830&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java Tue Dec 13 18:29:19 2011
@@ -2127,8 +2127,9 @@ public class GenericKeyedObjectPool<K,T>
private final LinkedList<Long> activeTimes = new LinkedList<Long>();
private final LinkedList<Long> idleTimes = new LinkedList<Long>();
private final LinkedList<Long> waitTimes = new LinkedList<Long>();
- private Object maxBorrowWaitTimeMillisLock = new Object();
- private volatile long maxBorrowWaitTimeMillis = 0;
+
+ private final Object maxBorrowWaitTimeMillisLock = new Object();
+ private volatile long maxBorrowWaitTimeMillis = 0; // @GuardedBy("maxBorrowWaitTimeMillisLock")
private ObjectName oname = null;
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1213830&r1=1213829&r2=1213830&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java Tue Dec 13 18:29:19 2011
@@ -1577,8 +1577,9 @@ public class GenericObjectPool<T> extend
private final LinkedList<Long> activeTimes = new LinkedList<Long>();
private final LinkedList<Long> idleTimes = new LinkedList<Long>();
private final LinkedList<Long> waitTimes = new LinkedList<Long>();
- private Object maxBorrowWaitTimeMillisLock = new Object();
- private volatile long maxBorrowWaitTimeMillis = 0;
+
+ private final Object maxBorrowWaitTimeMillisLock = new Object();
+ private volatile long maxBorrowWaitTimeMillis = 0; // @GuardedBy("maxBorrowWaitTimeMillisLock")
private ObjectName oname = null;