Author: markt
Date: Mon Sep 6 14:39:48 2010
New Revision: 993042
URL: http://svn.apache.org/viewvc?rev=993042&view=rev
Log:
Avoid NPE when a parallel request invalidates the current session
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=993042&r1=993041&r2=993042&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Mon Sep
6 14:39:48 2010
@@ -1033,6 +1033,11 @@ public class DeltaManager extends Cluste
DeltaSession session = null;
try {
session = (DeltaSession) findSession(sessionId);
+ if (session == null) {
+ // A parallel request has called session.invalidate() which has
+ // remove the session from the Manager.
+ return null;
+ }
DeltaRequest deltaRequest = session.getDeltaRequest();
session.lock();
SessionMessage msg = null;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=993042&r1=993041&r2=993042&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 6 14:39:48 2010
@@ -186,6 +186,11 @@
Add support for LAST_ACCESS_AT_START system property to DeltaSession.
(kfujino)
</fix>
+ <fix>
+ Avoid a NPE in the DeltaManager when a parallel request invalidates the
+ session before the current request has a chance to send the replication
+ message. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
