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 2016/05/20 10:51:05 UTC
svn commit: r1744697 - in /tomcat/trunk:
modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
webapps/docs/changelog.xml
Author: markt
Date: Fri May 20 10:51:05 2016
New Revision: 1744697
URL: http://svn.apache.org/viewvc?rev=1744697&view=rev
Log:
Fix a memory leak with the pool cleaner thread that retained a reference to the web application class loader for the first web application to use a connection pool.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1744697&r1=1744696&r2=1744697&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Fri May 20 10:51:05 2016
@@ -20,6 +20,8 @@ import java.lang.ref.WeakReference;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
@@ -1289,9 +1291,12 @@ public class ConnectionPool {
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(ConnectionPool.class.getClassLoader());
- poolCleanTimer = new Timer("Tomcat JDBC Pool Cleaner["+ System.identityHashCode(ConnectionPool.class.getClassLoader()) + ":"+
- System.currentTimeMillis() + "]", true);
- }finally {
+ // Create the timer thread in a PrivilegedAction so that a
+ // reference to the web application class loader is not created
+ // via Thread.inheritedAccessControlContext
+ PrivilegedAction<Timer> pa = new PrivilegedNewTimer();
+ poolCleanTimer = AccessController.doPrivileged(pa);
+ } finally {
Thread.currentThread().setContextClassLoader(loader);
}
}
@@ -1312,6 +1317,14 @@ public class ConnectionPool {
}
}
+ private static class PrivilegedNewTimer implements PrivilegedAction<Timer> {
+ @Override
+ public Timer run() {
+ return new Timer("Tomcat JDBC Pool Cleaner["+ System.identityHashCode(ConnectionPool.class.getClassLoader()) + ":"+
+ System.currentTimeMillis() + "]", true);
+ }
+ }
+
public static Set<TimerTask> getPoolCleaners() {
return Collections.<TimerTask>unmodifiableSet(cleaners);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1744697&r1=1744696&r2=1744697&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri May 20 10:51:05 2016
@@ -87,6 +87,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="jdbc-pool">
+ <changelog>
+ <fix>
+ Fix a memory leak with the pool cleaner thread that retained a reference
+ to the web application class loader for the first web application to use
+ a connection pool. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org