Author: jim
Date: Wed Mar 5 08:21:05 2008
New Revision: 633910
URL: http://svn.apache.org/viewvc?rev=633910&view=rev
Log:
Merge r627689 from trunk:
fix NPE
java.lang.NullPointerException at
org.apache.catalina.session.ManagerBase.processExpires(ManagerBase.java:682)
at
org.apache.catalina.session.ManagerBase.backgroundProcess(ManagerBase.java:667)
at
org.apache.catalina.core.ContainerBase.backgroundProcess(ContainerBase.java:1316)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1601)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1610)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1610)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1590)
at java.lang.Thread.run(Thread.java:619)
Submitted by: fhanik
Reviewed by: jim
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=633910&r1=633909&r2=633910&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar 5 08:21:05 2008
@@ -42,11 +42,6 @@
+1: markt, fhanik, jim
-1:
-* Fix NPE when iterating through sessions for expiration
- http://svn.apache.org/viewvc?view=rev&revision=627689
- +1: fhanik, markt, remm, jfclere
- -1:
-
* Add tests for the cookie parsing and use package
org.apache.catalina.tomcat.util.http
http://people.apache.org/~jfclere/patches/test_cookies.patch2
+1: jfclere, fhanik, markt
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=633910&r1=633909&r2=633910&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Wed
Mar 5 08:21:05 2008
@@ -679,7 +679,7 @@
if(log.isDebugEnabled())
log.debug("Start expire sessions " + getName() + " at " + timeNow
+ " sessioncount " + sessions.length);
for (int i = 0; i < sessions.length; i++) {
- if (!sessions[i].isValid()) {
+ if (sessions[i]!=null && !sessions[i].isValid()) {
expireHere++;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
