cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler ParserXJspSaxHandler.java Parser.java

[horwat]

horwat      01/04/26 18:32:47

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        ParserXJspSaxHandler.java Parser.java
  Log:
  Check to make sure string is not null before doing any manipulations. Fix minor tag 
handling bug.
  
  Revision  Changes    Path
  1.12      +5 -2      
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserXJspSaxHandler.java
  
  Index: ParserXJspSaxHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserXJspSaxHandler.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ParserXJspSaxHandler.java 2001/04/26 23:17:40     1.11
  +++ ParserXJspSaxHandler.java 2001/04/27 01:32:47     1.12
  @@ -448,9 +448,12 @@
       private void processCustomTagEnd(NodeTag node, Mark stop) 
        throws ParseException, JasperException {
        String bc = node.ti.getBodyContent();
  +        boolean hasBody = true;
   
  -        String charString = node.getText().toString();
  -        boolean hasBody = (charString.trim().length() > 0);
  +        if (node.getText() != null) {
  +            String charString = node.getText().toString();
  +            hasBody = (charString.trim().length() > 0);
  +        }
   
           // call begin tag processing with body info
           processCustomTagBeginDoIt(node, hasBody);
  
  
  
  1.10      +2 -2      
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Parser.java       2001/04/26 23:17:40     1.9
  +++ Parser.java       2001/04/27 01:32:47     1.10
  @@ -843,9 +843,9 @@
   
                listener.setTemplateInfo(parser.tmplStart, parser.tmplStop);           
 
                listener.handleTagBegin(start, reader.mark(), attrs, prefix,
  -                                     shortTagName, tli, ti, hasBody);
  +                                     shortTagName, tli, ti, true);
                listener.handleTagEnd(start, reader.mark(), prefix, 
  -                                   shortTagName, attrs, tli, ti, hasBody);
  +                                   shortTagName, attrs, tli, ti, true);
            } else { 
                // Body can be either
                //     - JSP tags