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 2001/03/22 01:53:36 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader StandardLoader.java
remm 01/03/21 16:53:35
Modified: catalina/src/share/org/apache/catalina/loader
StandardLoader.java
Log:
- Make the two attributes Jasper uses read only.
- That makes the classpath attribute immutable.
- The class loader attribute will eventually be removed.
Revision Changes Path
1.21 +15 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java
Index: StandardLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- StandardLoader.java 2001/02/21 06:03:43 1.20
+++ StandardLoader.java 2001/03/22 00:53:31 1.21
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v 1.20 2001/02/21 06:03:43 remm Exp $
- * $Revision: 1.20 $
- * $Date: 2001/02/21 06:03:43 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v 1.21 2001/03/22 00:53:31 remm Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/03/22 00:53:31 $
*
* ====================================================================
*
@@ -94,6 +94,10 @@
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
import org.apache.catalina.Logger;
+// FIXME : Define a new "servlet context" interface to void directly referncing
+// the ApplicationContext
+import org.apache.catalina.core.ApplicationContext;
+// End FIXME
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
@@ -112,7 +116,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.20 $ $Date: 2001/02/21 06:03:43 $
+ * @version $Revision: 1.21 $ $Date: 2001/03/22 00:53:31 $
*/
public final class StandardLoader
@@ -856,6 +860,9 @@
}
servletContext.setAttribute(Globals.CLASS_PATH_ATTR, classpath);
+ if (servletContext instanceof ApplicationContext)
+ ((ApplicationContext) servletContext).setAttributeReadOnly
+ (Globals.CLASS_PATH_ATTR);
}
@@ -913,7 +920,10 @@
if (servletContext == null)
return;
servletContext.setAttribute(Globals.CLASS_LOADER_ATTR,
- getClassLoader());
+ getClassLoader());
+ if (servletContext instanceof ApplicationContext)
+ ((ApplicationContext) servletContext).setAttributeReadOnly
+ (Globals.CLASS_LOADER_ATTR);
}