luehe 2004/08/10 16:37:50 Modified: jasper2/src/share/org/apache/jasper/compiler Tag: TOMCAT_5_0 JspDocumentParser.java Log: Ported fix for Bugilla 30067 ("Scripting elements are disallowed here" exception behind scriptless tag) Revision Changes Path No revision No revision 1.80.2.2 +5 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java Index: JspDocumentParser.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v retrieving revision 1.80.2.1 retrieving revision 1.80.2.2 diff -u -r1.80.2.1 -r1.80.2.2 --- JspDocumentParser.java 10 Aug 2004 23:33:02 -0000 1.80.2.1 +++ JspDocumentParser.java 10 Aug 2004 23:37:50 -0000 1.80.2.2 @@ -640,12 +640,13 @@ tagDependentNesting--; } + if (scriptlessBodyNode != null + && current.equals(scriptlessBodyNode)) { + scriptlessBodyNode = null; + } + if (current.getParent() != null) { current = current.getParent(); - if (scriptlessBodyNode != null - && current.equals(scriptlessBodyNode)) { - scriptlessBodyNode = null; - } } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]