Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 27705 invoked from network); 1 Jul 2009 17:06:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Jul 2009 17:06:44 -0000 Received: (qmail 58732 invoked by uid 500); 1 Jul 2009 16:53:31 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 58693 invoked by uid 500); 1 Jul 2009 16:53:31 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 58681 invoked by uid 99); 1 Jul 2009 16:53:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2009 16:53:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2009 16:53:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 911B92388865; Wed, 1 Jul 2009 16:53:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r790263 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java current/tc5.5.x/STATUS.txt Date: Wed, 01 Jul 2009 16:53:07 -0000 To: dev@tomcat.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090701165307.911B92388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Wed Jul 1 16:53:07 2009 New Revision: 790263 URL: http://svn.apache.org/viewvc?rev=790263&view=rev Log: Fix Java 5 dependency Boolean.parseBoolean() (regression) introduced in fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45996 I used the valueOf-variant suggested by funkman. I guess there's no need to vote again about that detail. The code is not uniform in the way it is done, but since TC 5.5 is stable, I prefer not to clean up everywhere. No changelog entry, because problem was introduced only after the last release. Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?rev=790263&r1=790262&r2=790263&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java Wed Jul 1 16:53:07 2009 @@ -289,8 +289,10 @@ localXsltFile = getServletConfig().getInitParameter("localXsltFile"); readmeFile = getServletConfig().getInitParameter("readmeFile"); - if (getServletConfig().getInitParameter("useAcceptRanges") != null) - useAcceptRanges = Boolean.parseBoolean(getServletConfig().getInitParameter("useAcceptRanges")); + value = getServletConfig().getInitParameter("useAcceptRanges"); + if (value != null) { + useAcceptRanges = Boolean.valueOf(value).booleanValue(); + } // Sanity check on the specified buffer sizes if (input < 256) Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=790263&r1=790262&r2=790263&view=diff ============================================================================== --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 1 16:53:07 2009 @@ -44,16 +44,6 @@ +1: markt, rjung -1: -* Fix Java 5 dependency Boolean.parseBoolean() (regression) - Introduced in fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45996 - http://svn.apache.org/viewvc?rev=781546&view=rev - Patch: http://people.apache.org/~rjung/patches/2009-06-30-bug45996-regression.patch - updated from a previous proposal based on the comments of Konstantin. - mark and konstatin: please vote again. - +1: rjung, kkolinko, markt - -0: new Boolean bad, Boolean.valueOf() much better - -1: - * Make AccessLogValve thread safe http://people.apache.org/~markt/patches/2009-06-30-AccessLogValve-tc5.patch +1: markt, kkolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org