Author: markt
Date: Thu Mar 22 13:52:08 2018
New Revision: 1827491
URL: http://svn.apache.org/viewvc?rev=1827491&view=rev
Log:
The listener is added for both Context and Server instances so it needs to be
removed for both as well.
Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1827491&r1=1827490&r2=1827491&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Thu
Mar 22 13:52:08 2018
@@ -302,11 +302,12 @@ public class NamingContextListener
}
if (container instanceof Server) {
- namingResources.removePropertyChangeListener(this);
ContextBindings.unbindClassLoader(container, token,
this.getClass().getClassLoader());
}
+ namingResources.removePropertyChangeListener(this);
+
ContextAccessController.unsetSecurityToken(getName(), token);
ContextAccessController.unsetSecurityToken(container, token);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1827491&r1=1827490&r2=1827491&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 22 13:52:08 2018
@@ -75,6 +75,11 @@
a session while loading it with <code>PersistentManager</code>.
(fschumacher)
</fix>
+ <fix>
+ Ensure that <code>NamingContextListener</code> instances are only
+ notified once of property changes on the associated naming resources.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
