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/01/13 06:20:49 UTC
cvs commit: jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/core StandardContext.java
remm 01/01/12 21:20:49
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- Fix path initialization of the DirContext.
Revision Changes Path
1.35 +15 -10 jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- StandardContext.java 2001/01/12 06:50:06 1.34
+++ StandardContext.java 2001/01/13 05:20:49 1.35
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/core/StandardContext.java,v 1.34 2001/01/12 06:50:06 remm Exp $
- * $Revision: 1.34 $
- * $Date: 2001/01/12 06:50:06 $
+ * $Header: /home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/core/StandardContext.java,v 1.35 2001/01/13 05:20:49 remm Exp $
+ * $Revision: 1.35 $
+ * $Date: 2001/01/13 05:20:49 $
*
* ====================================================================
*
@@ -136,7 +136,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.34 $ $Date: 2001/01/12 06:50:06 $
+ * @version $Revision: 1.35 $ $Date: 2001/01/13 05:20:49 $
*/
public class StandardContext
@@ -922,12 +922,17 @@
if (container == null) {
docBase = (new File(engineBase(), getDocBase())).getPath();
} else {
- // Use the "appBase" property of this container
- String appBase = ((Host) container).getAppBase();
- File file = new File(appBase);
- if (!file.isAbsolute())
- file = new File(engineBase(), appBase);
- docBase = (new File(file, getDocBase())).getPath();
+ File file = new File(getDocBase());
+ if (!file.isAbsolute()) {
+ // Use the "appBase" property of this container
+ String appBase = ((Host) container).getAppBase();
+ file = new File(appBase);
+ if (!file.isAbsolute())
+ file = new File(engineBase(), appBase);
+ docBase = (new File(file, getDocBase())).getPath();
+ } else {
+ docBase = file.getPath();
+ }
}
((BaseDirContext) resources).setDocBase(docBase);
}