You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/01/01 18:23:52 UTC
svn commit: r1648907 - in /tomcat/trunk/java/org/apache/tomcat/dbcp/pool2:
./ impl/DefaultPooledObject.java impl/LinkedBlockingDeque.java
Author: markt
Date: Thu Jan 1 17:23:52 2015
New Revision: 1648907
URL: http://svn.apache.org/r1648907
Log:
Update to Commons Pool 2.3 release
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed)
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 1 17:23:52 2015
@@ -1 +1 @@
-/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1643813
+/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1648905
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java?rev=1648907&r1=1648906&r2=1648907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java Thu Jan 1 17:23:52 2015
@@ -83,7 +83,11 @@ public class DefaultPooledObject<T> impl
@Override
public long getIdleTimeMillis() {
- return System.currentTimeMillis() - lastReturnTime;
+ final long elapsed = System.currentTimeMillis() - lastReturnTime;
+ // elapsed may be negative if:
+ // - another thread updates lastReturnTime during the calculation window
+ // - System.currentTimeMillis() is not monotonic (e.g. system time is set back)
+ return elapsed >= 0 ? elapsed : 0;
}
@Override
@@ -214,9 +218,7 @@ public class DefaultPooledObject<T> impl
state == PooledObjectState.RETURNING) {
state = PooledObjectState.IDLE;
lastReturnTime = System.currentTimeMillis();
- if (borrowedBy != null) {
- borrowedBy = null;
- }
+ borrowedBy = null;
return true;
}
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java?rev=1648907&r1=1648906&r2=1648907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java Thu Jan 1 17:23:52 2015
@@ -1228,6 +1228,9 @@ class LinkedBlockingDeque<E> extends Abs
/**
* Returns the successor node of the given non-null, but
* possibly previously deleted, node.
+ *
+ * @param n node whose successor is sought
+ * @return successor node
*/
private Node<E> succ(Node<E> n) {
// Chains of deleted nodes ending in null or self-links
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org