luehe 2002/12/16 09:34:32 Modified: jasper2/src/share/org/apache/jasper/compiler Parser.java Validator.java Log: Fixed 15391: Jasper generates a translation error if the body of jsp:params is supplied though jsp:body Revision Changes Path 1.48 +6 -16 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java Index: Parser.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- Parser.java 16 Dec 2002 16:13:28 -0000 1.47 +++ Parser.java 16 Dec 2002 17:34:32 -0000 1.48 @@ -1068,18 +1068,9 @@ * | ( '>' S? Param* '</jsp:params>' ) */ private void parseJspParams(Node parent) throws JasperException { - if( reader.matches( "/>" ) ) { - // No elements, don't create node. - } - else if( reader.matches( ">" ) ) { - reader.skipSpaces(); - Node jspParamsNode = new Node.ParamsAction(start, parent); - parseBody(jspParamsNode, "jsp:params", JAVAX_BODY_CONTENT_PARAM ); - } - else { - err.jspError(reader.mark(), "jsp.error.unterminated", - "<jsp:params" ); - } + Node jspParamsNode = new Node.ParamsAction(start, parent); + parseOptionalBody(jspParamsNode, "jsp:params", + JAVAX_BODY_CONTENT_PARAM ); } /* @@ -1090,7 +1081,6 @@ * ) */ private void parseFallBack(Node parent) throws JasperException { - Mark bodyStart = reader.mark(); Node fallBackNode = new Node.FallBackAction(start, parent); parseOptionalBody(fallBackNode, "jsp:fallback", JAVAX_BODY_CONTENT_TEMPLATE_TEXT); 1.62 +3 -10 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java Index: Validator.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- Validator.java 13 Dec 2002 18:06:08 -0000 1.61 +++ Validator.java 16 Dec 2002 17:34:32 -0000 1.62 @@ -492,13 +492,6 @@ if (subElems == null) { err.jspError(n, "jsp.error.params.emptyBody"); } - for (int i=0; i<subElems.size(); i++) { - Node subElem = subElems.getNode(i); - if (!(subElem instanceof Node.ParamAction)) { - err.jspError(n, "jsp.error.params.illegalChild"); - } - } - visitBody(n); }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>