jfclere 02/03/23 05:21:15
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardContext.java
Log:
Fix PR6982: The resource has no lifecycle and was not valid after stop/start.
Revision Changes Path
No revision
No revision
1.78.2.15 +17 -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.78.2.14
retrieving revision 1.78.2.15
diff -u -r1.78.2.14 -r1.78.2.15
--- StandardContext.java 2 Mar 2002 18:00:12 -0000 1.78.2.14
+++ StandardContext.java 23 Mar 2002 13:21:15 -0000 1.78.2.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.78.2.14 2002/03/02 18:00:12 glenn Exp $
- * $Revision: 1.78.2.14 $
- * $Date: 2002/03/02 18:00:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.78.2.15 2002/03/23 13:21:15 jfclere Exp $
+ * $Revision: 1.78.2.15 $
+ * $Date: 2002/03/23 13:21:15 $
*
* ====================================================================
*
@@ -143,7 +143,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.78.2.14 $ $Date: 2002/03/02 18:00:12 $
+ * @version $Revision: 1.78.2.15 $ $Date: 2002/03/23 13:21:15 $
*/
public class StandardContext
@@ -3312,6 +3312,19 @@
} catch (IllegalArgumentException e) {
log("Error initializing resources: " + e.getMessage());
ok = false;
+ }
+ } else {
+ DirContext dirContext = getResources();
+ if (dirContext instanceof ProxyDirContext) {
+ dirContext = ((ProxyDirContext) dirContext).getDirContext();
+ log("Configuring ProxyDirContext Resources" + dirContext);
+ }
+ if (dirContext instanceof BaseDirContext) {
+ ((BaseDirContext) dirContext).setDocBase(getBasePath());
+ ((BaseDirContext) dirContext).setCached(isCachingAllowed());
+ }
+ if (dirContext instanceof FileDirContext) {
+ filesystemBased = true;
}
}
if (getLoader() == null) { // (2) Required by Manager
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
