Author: kkolinko
Date: Fri Oct 29 00:03:47 2010
New Revision: 1028556
URL: http://svn.apache.org/viewvc?rev=1028556&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50131
Avoid possible NPE in debug output in PersistentValve.
Based on the patch provided by sebb
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.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=1028556&r1=1028555&r2=1028556&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Oct 29 00:03:47 2010
@@ -77,13 +77,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kfujino, markt, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50131
- Avoid possible NPE in debug output in PersistentValve.
- Patch by sebb
- https://issues.apache.org/bugzilla/attachment.cgi?id=26194
- +1: kkolinko, kfujino, markt
- -1:
-
* Update Commons daemon to 1.0.4
Version 1.0.4 is bug fixing release. (Patch is trivial changing the version
number to 1.0.4 in build.properties.default, so not provided)
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java?rev=1028556&r1=1028555&r2=1028556&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
Fri Oct 29 00:03:47 2010
@@ -178,9 +178,11 @@ public class PersistentValve
} else {
if (container.getLogger().isDebugEnabled())
container.getLogger().debug("newsessionId store: " +
store + " session: " +
- session + " valid: " + session.isValid() +
- " Staled: " +
- isSessionStale(session,
System.currentTimeMillis()));
+ session +
+ (session == null ? "" :
+ " valid: " + session.isValid() +
+ " stale: " +
+ isSessionStale(session,
System.currentTimeMillis())));
}
} else {
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=1028556&r1=1028555&r2=1028556&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Oct 29
00:03:47 2010
@@ -50,6 +50,10 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>50131</bug>: Avoid possible NPE in debug output in
PersistentValve.
+ Patch provided by sebb. (kkolinko)
+ </fix>
+ <fix>
Avoid unnecessary cast in StandardContext. (markt)
</fix>
</changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
