remm 2003/02/17 08:31:45 Modified: util/java/org/apache/tomcat/util/http/mapper Mapper.java Log: - Fix a bug where the wilcard mapping caused an array out of bounds if the URI started with the path, but couldn't mapped to it, and it was in the first position (found using the HTML manager help file). - Fix same bug for context mapping, but this could only happen if there was no root context (which doesn't happen too often). Revision Changes Path 1.6 +6 -0 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java Index: Mapper.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Mapper.java 17 Feb 2003 03:38:54 -0000 1.5 +++ Mapper.java 17 Feb 2003 16:31:44 -0000 1.6 @@ -415,6 +415,9 @@ break; } pos--; + if (pos < 0) { + break; + } } if (!found) { if (contexts[0].name.equals("")) { @@ -589,6 +592,9 @@ break; } pos--; + if (pos < 0) { + break; + } } if (found) { mappingData.wrapperPath.setString(wrappers[pos].name);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]