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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
