yoavs 2004/09/02 11:45:38 Modified: catalina/src/share/org/apache/catalina/startup Tag: TOMCAT_5_0 SetDocBaseRule.java webapps/docs Tag: TOMCAT_5_0 changelog.xml Log: Fixed Bugzilla 30415, a dubious use case. Revision Changes Path No revision No revision 1.13.2.1 +2 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Attic/SetDocBaseRule.java Index: SetDocBaseRule.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Attic/SetDocBaseRule.java,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -r1.13 -r1.13.2.1 --- SetDocBaseRule.java 26 May 2004 16:16:50 -0000 1.13 +++ SetDocBaseRule.java 2 Sep 2004 18:45:38 -0000 1.13.2.1 @@ -120,7 +120,8 @@ docBase = file.getCanonicalPath(); } - if (docBase.toLowerCase().endsWith(".war")) { + if ((docBase.toLowerCase().endsWith(".war")) && + (file.isFile())) { URL war = new URL("jar:" + (new File(docBase)).toURL() + "!/"); String contextPath = child.getPath(); if (contextPath.equals("")) { No revision No revision 1.70.2.27 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.26 retrieving revision 1.70.2.27 diff -u -r1.70.2.26 -r1.70.2.27 --- changelog.xml 2 Sep 2004 15:19:26 -0000 1.70.2.26 +++ changelog.xml 2 Sep 2004 18:45:38 -0000 1.70.2.27 @@ -57,6 +57,9 @@ <fix> <bug>30636</bug>: NPE in DigesterFactory when resources cannot be located. (yoavs) </fix> + <fix> + <bug>30415</bug>: Directories ending in .war not handled well. (yoavs) + </fix> </changelog> </subsection> <subsection name="Webapps">
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]