remm 2003/01/13 09:34:26
Modified: catalina/src/share/org/apache/catalina/core
StandardHostDeployer.java
Log:
- Fix bad test which causes a string out of bounds exception.
Revision Changes Path
1.12 +9 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java
Index: StandardHostDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StandardHostDeployer.java 10 Jan 2003 15:52:18 -0000 1.11
+++ StandardHostDeployer.java 13 Jan 2003 17:34:25 -0000 1.12
@@ -271,9 +271,11 @@
if (isWAR) {
filename = filename.substring(0,filename.length()-4);
}
- if (contextPath.length() == 0 && !filename.equals("ROOT")) {
- throw new IllegalArgumentException
- (sm.getString("standardHost.pathMatch", "/", "ROOT"));
+ if (contextPath.length() == 0) {
+ if (!filename.equals("ROOT")) {
+ throw new IllegalArgumentException
+ (sm.getString("standardHost.pathMatch", "/", "ROOT"));
+ }
} else if (!filename.equals(contextPath.substring(1))) {
throw new IllegalArgumentException
(sm.getString("standardHost.pathMatch", contextPath, filename));
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
