remm 02/03/14 13:41:35
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- Use the allocate method.
- If the dir context is a WAR dir context or a file dir context,
reinstantiate it (it's simpler).
Revision Changes Path
1.102 +16 -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.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- StandardContext.java 2 Mar 2002 16:38:58 -0000 1.101
+++ StandardContext.java 14 Mar 2002 21:41:35 -0000 1.102
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.101 2002/03/02 16:38:58 glenn Exp $
- * $Revision: 1.101 $
- * $Date: 2002/03/02 16:38:58 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.102 2002/03/14 21:41:35 remm Exp $
+ * $Revision: 1.102 $
+ * $Date: 2002/03/14 21:41:35 $
*
* ====================================================================
*
@@ -147,7 +147,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.101 $ $Date: 2002/03/02 16:38:58 $
+ * @version $Revision: 1.102 $ $Date: 2002/03/14 21:41:35 $
*/
public class StandardContext
@@ -3331,6 +3331,14 @@
log("Error initializing resources: " + e.getMessage());
ok = false;
}
+ if (ok) {
+ DirContext dirContext =
+ ((ProxyDirContext) resources).getDirContext();
+ if ((dirContext != null)
+ && (dirContext instanceof BaseDirContext)) {
+ ((BaseDirContext) dirContext).allocate();
+ }
+ }
}
if (getLoader() == null) { // (2) Required by Manager
if (getPrivileged()) {
@@ -3556,6 +3564,10 @@
}
if (dirContext instanceof BaseDirContext) {
((BaseDirContext) dirContext).release();
+ if ((dirContext instanceof WARDirContext)
+ || (dirContext instanceof FileDirContext)) {
+ resources = null;
+ }
} else {
log("Cannot release " + resources);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
