Author: kkolinko
Date: Thu May 8 18:36:11 2014
New Revision: 1593371
URL: http://svn.apache.org/r1593371
Log:
Merged r1593335 from tomcat/trunk:
Review of r1593288:
Do not forget to call the symmetrical unset method on stop.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1593335
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1593371&r1=1593370&r2=1593371&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
Thu May 8 18:36:11 2014
@@ -329,7 +329,8 @@ public class NamingContextListener
}
ContextAccessController.unsetSecurityToken(getName(), container);
-
+ ContextAccessController.unsetSecurityToken(container, container);
+
// unregister mbeans.
Collection<ObjectName> names = objectNames.values();
for (ObjectName objectName : names) {
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=1593371&r1=1593370&r2=1593371&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu May 8 18:36:11 2014
@@ -156,6 +156,10 @@
requiring code to have the <code>accessClassInPackage</code> permission
when running under a security manager. (markt)
</add>
+ <fix>
+ Make the naming context tokens for containers more robust by using a
+ separate object. (markt/kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
