[jboss-cvs] JBossAS SVN: r78589 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/session.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-09-16 11:02:05 -0400 (Tue, 16 Sep 2008)
New Revision: 78589

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
Log:
[JBAS-5964] Fix NPE in expiration of passivated sessions

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2008-09-16 13:13:43 UTC (rev 78588)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2008-09-16 15:02:05 UTC (rev 78589)
@@ -1289,13 +1289,19 @@
                      // Passivated session needs to be expired. A call to 
                      // findSession will bring it out of passivation
                      Session session = findSession(realId);
-                     session.isValid(); // will expire
+                     if (session != null)
+                     {
+                        session.isValid(); // will expire
+                        continue;
+                     }
                   }
-                  else
-                  {
-                     proxy_.removeSessionLocal(realId, osu.owner);
-                     unloadedSessions_.remove(realId);
-                  }
+                  
+                  // If we get here either !osu.passivated, or the session
+                  // couldn't be reactivated (invalidated by user). 
+                  // Either way, do a cleanup
+                  proxy_.removeSessionLocal(realId, osu.owner);
+                  unloadedSessions_.remove(realId);
+                  
                }
                else if (passivate && !osu.passivated)
                {