Author: markt
Date: Wed Sep 12 15:49:58 2018
New Revision: 1840709
URL: http://svn.apache.org/viewvc?rev=1840709&view=rev
Log:
Update the internal fork of Apache Commons Pool 2 to d4e0e88 (2018-09-12) to
pick up some clean-up.
Modified:
tomcat/trunk/MERGE.txt
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/MERGE.txt?rev=1840709&r1=1840708&r2=1840709&view=diff
==============================================================================
--- tomcat/trunk/MERGE.txt (original)
+++ tomcat/trunk/MERGE.txt Wed Sep 12 15:49:58 2018
@@ -75,4 +75,4 @@ Pool2
Sub-tree
src/main/java/org/apache/commons/pool2
The SHA1 ID for the most recent commit to be merged to Tomcat is:
-3e02523b6907fb22f3582544fe362c785821bcb8
+d4e0e88227ad91d8c8ef36ba01d656f71c770f83
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java?rev=1840709&r1=1840708&r2=1840709&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
Wed Sep 12 15:49:58 2018
@@ -217,7 +217,7 @@ public abstract class BaseGenericObjectP
this.blockWhenExhausted = blockWhenExhausted;
}
- protected void setConfig(BaseObjectPoolConfig<T> conf) {
+ protected void setConfig(final BaseObjectPoolConfig<T> conf) {
setLifo(conf.getLifo());
setMaxWaitMillis(conf.getMaxWaitMillis());
setBlockWhenExhausted(conf.getBlockWhenExhausted());
@@ -785,6 +785,12 @@ public abstract class BaseGenericObjectP
}
/**
+ * Stops the evictor.
+ */
+ void stopEvitor() {
+ startEvictor(-1L);
+ }
+ /**
* Tries to ensure that the configured minimum number of idle instances are
* available in the pool.
* @throws Exception if an error occurs creating idle instances
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java?rev=1840709&r1=1840708&r2=1840709&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java Wed
Sep 12 15:49:58 2018
@@ -107,23 +107,23 @@ class EvictionTimer {
}
/**
- * Thread factory that creates a thread, with the context classloader from
this class.
+ * Thread factory that creates a thread, with the context class loader
from this class.
*/
private static class EvictorThreadFactory implements ThreadFactory {
@Override
- public Thread newThread(final Runnable r) {
- final Thread t = new Thread(null, r,
"commons-pool-evictor-thread");
+ public Thread newThread(final Runnable runnable) {
+ final Thread thread = new Thread(null, runnable,
"commons-pool-evictor-thread");
AccessController.doPrivileged(new PrivilegedAction<Void>() {
@Override
public Void run() {
-
t.setContextClassLoader(EvictorThreadFactory.class.getClassLoader());
+
thread.setContextClassLoader(EvictorThreadFactory.class.getClassLoader());
return null;
}
});
- return t;
+ return thread;
}
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java?rev=1840709&r1=1840708&r2=1840709&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
Wed Sep 12 15:49:58 2018
@@ -689,7 +689,7 @@ public class GenericKeyedObjectPool<K, T
// Stop the evictor before the pool is closed since evict() calls
// assertOpen()
- startEvictor(-1L);
+ stopEvitor();
closed = true;
// This clear removes any idle objects
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java?rev=1840709&r1=1840708&r2=1840709&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
Wed Sep 12 15:49:58 2018
@@ -673,7 +673,7 @@ public class GenericObjectPool<T> extend
// Stop the evictor before the pool is closed since evict() calls
// assertOpen()
- startEvictor(-1L);
+ stopEvitor();
closed = true;
// This clear removes any idle objects
@@ -823,8 +823,8 @@ public class GenericObjectPool<T> extend
localMaxTotal = Integer.MAX_VALUE;
}
- long localStartTimeMillis = System.currentTimeMillis();
- long localMaxWaitTimeMillis = Math.max(getMaxWaitMillis(), 0);
+ final long localStartTimeMillis = System.currentTimeMillis();
+ final long localMaxWaitTimeMillis = Math.max(getMaxWaitMillis(), 0);
// Flag that indicates if create should:
// - TRUE: call the factory to create an object
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1840709&r1=1840708&r2=1840709&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 12 15:49:58 2018
@@ -76,6 +76,10 @@
Port DBCP transaction synchronization registry fix
(commit d49d45e). (remm)
</fix>
+ <update>
+ Update the internal fork of Apache Commons Pool 2 to d4e0e88
+ (2018-09-12) to pick up some bug fixes and enhancements. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
