glenn 02/05/16 14:40:46
Modified: catalina/src/share/org/apache/catalina/core
StandardHost.java
Log:
Modified MAPPING error uri arg so it provides the source URI
Revision Changes Path
1.28 +8 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StandardHost.java 2 May 2002 22:14:45 -0000 1.27
+++ StandardHost.java 16 May 2002 21:40:46 -0000 1.28
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
1.27 2002/05/02 22:14:45 craigmcc Exp $
- * $Revision: 1.27 $
- * $Date: 2002/05/02 22:14:45 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
1.28 2002/05/16 21:40:46 glenn Exp $
+ * $Revision: 1.28 $
+ * $Date: 2002/05/16 21:40:46 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.27 $ $Date: 2002/05/02 22:14:45 $
+ * @version $Revision: 1.28 $ $Date: 2002/05/16 21:40:46 $
*/
public class StandardHost
@@ -621,14 +621,15 @@
if (debug > 1)
log(" Trying the longest context path prefix");
Context context = null;
+ String mapuri = uri;
while (true) {
- context = (Context) findChild(uri);
+ context = (Context) findChild(mapuri);
if (context != null)
break;
- int slash = uri.lastIndexOf('/');
+ int slash = mapuri.lastIndexOf('/');
if (slash < 0)
break;
- uri = uri.substring(0, slash);
+ mapuri = mapuri.substring(0, slash);
}
// If no Context matches, select the default Context
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
