Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 49935 invoked from network); 22 Jul 2005 13:01:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Jul 2005 13:01:51 -0000 Received: (qmail 22969 invoked by uid 500); 22 Jul 2005 13:01:29 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 22898 invoked by uid 500); 22 Jul 2005 13:01:29 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 22859 invoked by uid 500); 22 Jul 2005 13:01:28 -0000 Received: (qmail 22841 invoked by uid 99); 22 Jul 2005 13:01:28 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 22 Jul 2005 06:01:17 -0700 Received: (qmail 49609 invoked by uid 1670); 22 Jul 2005 13:01:14 -0000 Date: 22 Jul 2005 13:01:14 -0000 Message-ID: <20050722130114.49608.qmail@minotaur.apache.org> From: yoavs@apache.org To: jakarta-tomcat-jasper-cvs@apache.org Subject: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspWriterImpl.java X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ 35114: Add failOnError flag to JspC, by ziweth. (yoavs) + + 35410: Fixed NPE in JspWriterImpl. (yoavs) + 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