Fix race condition when saving and recycling session in PersistentValve.

Author: KeiichiFujino

java/org/apache/catalina/valves/PersistentValve.java

@@ -170,22 +170,20 @@ public void invoke(Request request, Response response)
                     if (manager instanceof StoreManager) {
                         Session session = manager.findSession(newsessionId);
                         Store store = ((StoreManager) manager).getStore();
-                        if (store != null && session != null && session.isValid() &&
-                                !isSessionStale(session, System.currentTimeMillis())) {
-                            store.save(session);
-                            ((StoreManager) manager).removeSuper(session);
-                            session.recycle();
-                        } else {
-                            if (container.getLogger().isDebugEnabled()) {
-                                container.getLogger().debug("newsessionId store: " +
-                                        store + " session: " + session +
-                                        " valid: " +
-                                        (session == null ? "N/A" : Boolean.toString(
-                                                session.isValid())) +
-                                        " stale: " + isSessionStale(session,
-                                                System.currentTimeMillis()));
+                        synchronized (session) {
+                            if (store != null && session != null && session.isValid()
+                                    && !isSessionStale(session, System.currentTimeMillis())) {
+                                store.save(session);
+                                ((StoreManager) manager).removeSuper(session);
+                                session.recycle();
+                            } else {
+                                if (container.getLogger().isDebugEnabled()) {
+                                    container.getLogger()
+                                            .debug("newsessionId store: " + store + " session: " + session + " valid: "
+                                                    + (session == null ? "N/A" : Boolean.toString(session.isValid()))
+                                                    + " stale: " + isSessionStale(session, System.currentTimeMillis()));
+                                }
                             }
-
                         }
                     } else {
                         if (container.getLogger().isDebugEnabled()) {

webapps/docs/changelog.xml

@@ -51,6 +51,10 @@
         The health check valve will now check the state of its associated
         containers to report availability. (remm)
       </update>
+      <fix>
+        Fix race condition when saving and recycling session in
+        <code>PersistentValve</code>. (kfujino)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">