tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspWriterImpl.java
Date Fri, 22 Jul 2005 13:01:14 GMT
yoavs       2005/07/22 06:01:14

  Modified:    webapps/docs changelog.xml
               jasper2/src/share/org/apache/jasper/runtime
                        JspWriterImpl.java
  Log:
  Bugzilla 35410: http://issues.apache.org/bugzilla/show_bug.cgi?id=35410
  
  Revision  Changes    Path
  1.332     +3 -0      jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.331
  retrieving revision 1.332
  diff -u -r1.331 -r1.332
  --- changelog.xml	22 Jul 2005 12:52:32 -0000	1.331
  +++ changelog.xml	22 Jul 2005 13:01:14 -0000	1.332
  @@ -266,6 +266,9 @@
         <add>
           <bug>35114</bug>: Add failOnError flag to JspC, by ziweth. (yoavs)
         </add>
  +      <fix>
  +        <bug>35410</bug>: Fixed NPE in JspWriterImpl. (yoavs)
  +      </fix>
       </changelog>
     </subsection>
     
  
  
  
  1.16      +7 -1      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java
  
  Index: JspWriterImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JspWriterImpl.java	24 Mar 2005 15:39:56 -0000	1.15
  +++ JspWriterImpl.java	22 Jul 2005 13:01:14 -0000	1.16
  @@ -333,7 +333,13 @@
        * because it must suppress I/O exceptions.
        */
       public void write(String s) throws IOException {
  -        write(s, 0, s.length());
  +        // Simple fix for Bugzilla 35410
  +        // Calling the other write function so as to init the buffer anyways
  +        if(s == null) {
  +            write(s, 0, 0);
  +        } else {
  +            write(s, 0, s.length());
  +        }
       }
       
       
  
  
  

---------------------------------------------------------------------
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