remm 01/06/11 15:44:18
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.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.61 +11 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- StandardContext.java 2001/05/31 03:53:49 1.60
+++ StandardContext.java 2001/06/11 22:44:15 1.61
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.60 2001/05/31 03:53:49 remm Exp $
- * $Revision: 1.60 $
- * $Date: 2001/05/31 03:53:49 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.61 2001/06/11 22:44:15 remm Exp $
+ * $Revision: 1.61 $
+ * $Date: 2001/06/11 22:44:15 $
*
* ====================================================================
*
@@ -141,7 +141,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.60 $ $Date: 2001/05/31 03:53:49 $
+ * @version $Revision: 1.61 $ $Date: 2001/06/11 22:44:15 $
*/
public class StandardContext
@@ -3296,6 +3296,13 @@
// Finalize our character set mapper
setCharsetMapper(null);
+
+ // Create and register the associated naming context, if internal
+ // naming is used
+ if (isUseNaming()) {
+ ContextAccessController.unsetSecurityToken
+ (getNamingContextName(), this);
+ }
// Normal container shutdown processing
if (debug >= 1)
