remm 2004/01/11 02:05:35
Modified: catalina/src/share/org/apache/catalina/startup
SetDocBaseRule.java
Log:
- Fix array out of bounds when docBase is equal to "".
Revision Changes Path
1.10 +10 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java
Index: SetDocBaseRule.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SetDocBaseRule.java 27 Sep 2003 12:06:32 -0000 1.9
+++ SetDocBaseRule.java 11 Jan 2004 10:05:35 -0000 1.10
@@ -193,10 +193,14 @@
}
if (docBase.startsWith(canonicalAppBase.getPath())) {
- docBase = docBase.substring
- (canonicalAppBase.getPath().length() + 1);
+ docBase = docBase.substring(canonicalAppBase.getPath().length());
+ docBase = docBase.replace(File.separatorChar, '/');
+ if (docBase.startsWith("/")) {
+ docBase = docBase.substring(1);
+ }
+ } else {
+ docBase = docBase.replace(File.separatorChar, '/');
}
- docBase = docBase.replace(File.separatorChar, '/');
child.setDocBase(docBase);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
