tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JspDocumentParser.java
Date Tue, 13 Jul 2004 20:38:56 GMT
luehe       2004/07/13 13:38:56

  Modified:    jasper2/src/share/org/apache/jasper/compiler
                        JspDocumentParser.java
  Log:
  Fixed Bugilla 30067 ("Scripting elements are disallowed here" exception behind scriptless
tag)
  
  Revision  Changes    Path
  1.82      +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.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- JspDocumentParser.java	13 Jul 2004 18:40:08 -0000	1.81
  +++ JspDocumentParser.java	13 Jul 2004 20:38:56 -0000	1.82
  @@ -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: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message