You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/10/13 07:58:53 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardWrapper.java
craigmcc 00/10/12 22:58:53
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapper.java
Log:
Enforce the rule that a <jsp-file> value must be a context-relative
path starting with a '/' character.
Revision Changes Path
1.10 +8 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StandardWrapper.java 2000/09/28 19:00:18 1.9
+++ StandardWrapper.java 2000/10/13 05:58:52 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v 1.9 2000/09/28 19:00:18 craigmcc Exp $
- * $Revision: 1.9 $
- * $Date: 2000/09/28 19:00:18 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v 1.10 2000/10/13 05:58:52 craigmcc Exp $
+ * $Revision: 1.10 $
+ * $Date: 2000/10/13 05:58:52 $
*
* ====================================================================
*
@@ -101,7 +101,7 @@
* make them efficient are counter-productive.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.9 $ $Date: 2000/09/28 19:00:18 $
+ * @version $Revision: 1.10 $ $Date: 2000/10/13 05:58:52 $
*/
public final class StandardWrapper
@@ -306,6 +306,10 @@
* @param jspFile JSP file URI
*/
public void setJspFile(String jspFile) {
+
+ if ((jspFile != null) && !jspFile.startsWith("/"))
+ throw new IllegalArgumentException
+ (sm.getString("standardWrapper.jspFile.format", jspFile));
String oldJspFile = this.jspFile;
this.jspFile = jspFile;