You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2013/10/07 10:52:24 UTC
svn commit: r1529796 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/manager/StatusManagerServlet.java
webapps/docs/changelog.xml
Author: violetagg
Date: Mon Oct 7 08:52:23 2013
New Revision: 1529796
URL: http://svn.apache.org/r1529796
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55629
Merged revision 1529787 from tomcat/trunk:
Remove JMX notification listener when destroying servlet o.a.catalina.manager.StatusManagerServlet
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1529787
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=1529796&r1=1529795&r2=1529796&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Mon Oct 7 08:52:23 2013
@@ -165,7 +165,15 @@ public class StatusManagerServlet
@Override
public void destroy() {
- // No actions necessary
+ // Unregister with MBean server
+ String onStr = "JMImplementation:type=MBeanServerDelegate";
+ ObjectName objectName;
+ try {
+ objectName = new ObjectName(onStr);
+ mBeanServer.removeNotificationListener(objectName, this, null, null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
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=1529796&r1=1529795&r2=1529796&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 7 08:52:23 2013
@@ -121,6 +121,11 @@
<code>sessionCookiePath="/"</code> to make the implications
for session fixation protection clearer. (markt)
</add>
+ <fix>
+ <bug>55629</bug>: Ensure that the JMX notification listener added during
+ initialization of the servlet org.apache.catalina.manager.StatusManagerServlet
+ is removed in the destroy phase. (violetagg)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org