You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2002/01/23 01:20:18 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core NamingContextListener.java
remm 02/01/22 16:20:18
Modified: catalina/src/share/org/apache/catalina/core
NamingContextListener.java
Log:
- Don't set the global ENC as read-only, since it is never directly accessible from the
webapps (and it can be very nice to be able to directly modify it from one of
the Catalina components).
Revision Changes Path
1.8 +8 -10 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
Index: NamingContextListener.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NamingContextListener.java 22 Jan 2002 16:12:26 -0000 1.7
+++ NamingContextListener.java 23 Jan 2002 00:20:18 -0000 1.8
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v 1.7 2002/01/22 16:12:26 remm Exp $
- * $Revision: 1.7 $
- * $Date: 2002/01/22 16:12:26 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v 1.8 2002/01/23 00:20:18 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/01/23 00:20:18 $
*
* ====================================================================
*
@@ -116,7 +116,7 @@
* with each context and server.
*
* @author Remy Maucherat
- * @version $Revision: 1.7 $ $Date: 2002/01/22 16:12:26 $
+ * @version $Revision: 1.8 $ $Date: 2002/01/23 00:20:18 $
*/
public class NamingContextListener
@@ -281,7 +281,6 @@
}
ContextAccessController.setSecurityToken(getName(), container);
ContextBindings.bindContext(container, namingContext, container);
- //ContextBindings.bindThread(container, container);
// Setting the context in read/write mode
ContextAccessController.setWritable(getName(), container);
@@ -292,13 +291,10 @@
log(sm.getString("naming.namingContextCreationFailed", e));
}
- // Setting the context in read only mode
- ContextAccessController.setReadOnly(getName());
-
- //ContextBindings.unbindThread(container, container);
-
// Binding the naming context to the class loader
if (container instanceof Context) {
+ // Setting the context in read only mode
+ ContextAccessController.setReadOnly(getName());
try {
ContextBindings.bindClassLoader
(container, container,
@@ -351,6 +347,8 @@
/**
* Acknowledge the occurrence of the specified event.
+ * Note: Will never be called when the listener is associated to a Server,
+ * since it is not a Container.
*
* @param event ContainerEvent that has occurred
*/
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>