larryi 01/01/12 10:04:24
Modified: src/share/org/apache/tomcat/util Tag: tomcat_32
PrefixMapper.java
Log:
Reimplement the last fix so the root context (i.e. "") doesn't have problems.
Revision Changes Path
No revision
No revision
1.3.2.2 +7 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java
Index: PrefixMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- PrefixMapper.java 2001/01/04 21:28:33 1.3.2.1
+++ PrefixMapper.java 2001/01/12 18:04:20 1.3.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v 1.3.2.1
2001/01/04 21:28:33 marcsaeg Exp $
- * $Revision: 1.3.2.1 $
- * $Date: 2001/01/04 21:28:33 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v 1.3.2.2
2001/01/12 18:04:20 larryi Exp $
+ * $Revision: 1.3.2.2 $
+ * $Date: 2001/01/12 18:04:20 $
*
* ====================================================================
*
@@ -215,11 +215,14 @@
if( container!=null ) return container;
}
- while (s.length() > 0) {
+ while (s.length() >= 0) {
//if(debug>8) context.log( "Prefix: " + s );
container = myMap.prefixMappedServlets.get(s);
if (container == null) {
+ // if empty string didn't map, time to give up
+ if ( s.length() == 0 )
+ break;
s=URLUtil.removeLast( s );
} else {
if( myMap.mapCacheEnabled ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
