Author: kfujino
Date: Tue Dec 4 06:08:22 2012
New Revision: 1416789
URL: http://svn.apache.org/viewvc?rev=1416789&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54150
Make sure that SlowQueryReportJmx mbean deregistered during webapp shutdown.
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1416789&r1=1416788&r2=1416789&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Tue Dec 4 06:08:22 2012
@@ -402,7 +402,9 @@ public class ConnectionPool {
PoolProperties.InterceptorDefinition[] proxies =
getPoolProperties().getJdbcInterceptorsAsArray();
for (int i=0; i<proxies.length; i++) {
try {
-
proxies[i].getInterceptorClass().newInstance().poolClosed(this);
+ JdbcInterceptor interceptor =
proxies[i].getInterceptorClass().newInstance();
+ interceptor.setProperties(proxies[i].getProperties());
+ interceptor.poolClosed(this);
}catch (Exception x) {
log.debug("Unable to inform interceptor of pool closure.",x);
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1416789&r1=1416788&r2=1416789&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Dec 4 06:08:22 2012
@@ -107,6 +107,10 @@
Fix a handful of Eclipse warnings in the JDBC pool source code
including
the warnings reported in <bug>53565</bug>. (markt)
</scode>
+ <fix>
+ <bug>54150</bug>: Make sure that SlowQueryReportJmx mbean deregistered
+ during webapp shutdown. Reported by Alex Franken. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
