remm 01/06/11 15:44:05
Modified: catalina/src/share/org/apache/naming
ContextAccessController.java
Log:
- Untested fix for a bug when stopping and restarting a context later with
the access controller of the JNDI ENC. The read only flag must be unset
when stopping the context.
Bug reported by Ulf Jaehrig <ulf.jaehrig at desys.com>
Revision Changes Path
1.3 +17 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ContextAccessController.java
Index: ContextAccessController.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ContextAccessController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContextAccessController.java 2001/01/25 18:35:10 1.2
+++ ContextAccessController.java 2001/06/11 22:44:03 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ContextAccessController.java,v
1.2 2001/01/25 18:35:10 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2001/01/25 18:35:10 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ContextAccessController.java,v
1.3 2001/06/11 22:44:03 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/06/11 22:44:03 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
* Handles the access control on the JNDI contexts.
*
* @author Remy Maucherat
- * @version $Revision: 1.2 $ $Date: 2001/01/25 18:35:10 $
+ * @version $Revision: 1.3 $ $Date: 2001/06/11 22:44:03 $
*/
public class ContextAccessController {
@@ -104,6 +104,19 @@
public static void setSecurityToken(Object name, Object token) {
if ((!securityTokens.containsKey(name)) && (token != null)) {
securityTokens.put(name, token);
+ }
+ }
+
+
+ /**
+ * Remove a security token for a context.
+ *
+ * @param name Name of the context
+ * @param context Security token
+ */
+ public static void unsetSecurityToken(Object name, Object token) {
+ if (checkSecurityToken(name, token)) {
+ securityTokens.remove(name);
}
}