Author: markt
Date: Fri Aug 12 07:56:48 2011
New Revision: 1156993
URL: http://svn.apache.org/viewvc?rev=1156993&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51403
Avoid NPE in JULI FileHandler if formatter is misconfigured
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/connectors/juli/src/java/org/apache/juli/FileHandler.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1156993&r1=1156992&r2=1156993&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Aug 12 07:56:48 2011
@@ -77,12 +77,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt
-1:
-* https://issues.apache.org/bugzilla/show_bug.cgi?id=51403
- Avoid NPE in JULI FileHandler if formatter is misconfigured
- http://svn.apache.org/viewvc?rev=1137996&view=rev
- +1: kkolinko, markt, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36362
Handle tag files with attribute names that are not valid Java identifiers
http://svn.apache.org/viewvc?rev=1138950&view=rev
Modified:
tomcat/tc5.5.x/trunk/connectors/juli/src/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/juli/src/java/org/apache/juli/FileHandler.java?rev=1156993&r1=1156992&r2=1156993&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/connectors/juli/src/java/org/apache/juli/FileHandler.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/juli/src/java/org/apache/juli/FileHandler.java
Fri Aug 12 07:56:48 2011
@@ -258,7 +258,8 @@ public class FileHandler
try {
setFormatter((Formatter)
cl.loadClass(formatterName).newInstance());
} catch (Exception e) {
- // Ignore
+ // Ignore and fallback to defaults
+ setFormatter(new SimpleFormatter());
}
} else {
setFormatter(new SimpleFormatter());
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1156993&r1=1156992&r2=1156993&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Aug 12
07:56:48 2011
@@ -59,7 +59,12 @@
Fix CVE-2011-2204. Prevent user passwords appearing in log files if a
runtime exception (e.g. OOME) occurs while creating a new user for a
MemoryUserDatabase via JMX. (markt)
- </fix> </changelog>
+ </fix>
+ <fix>
+ <bug>51403</bug>: Avoid NullPointerException in JULI FileHandler if
+ formatter is misconfigured. (kkolinko)
+ </fix>
+ </changelog>
</subsection>
<subsection name="Webapps">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
