Move save-after-request code to manager from valve.

Author: jcoleman

spec/requests/sessions_spec.rb

@@ -130,6 +130,10 @@
           post("#{SESSION_ATTRIBUTES_PATH}/param2", body: {value: '5', sleep: 2000})
         end
 
+        sleep 0.5
+        get("#{SESSION_ATTRIBUTES_PATH}/param2")
+        json['value'].should == '5'
+
         post("#{SESSION_ATTRIBUTES_PATH}/param2", body: {value: '6'})
         get("#{SESSION_ATTRIBUTES_PATH}/param2")
         json['value'].should == '6'

src/main/java/com/orangefunction/tomcat/redissessions/RedisSessionHandlerValve.java

@@ -25,30 +25,7 @@ public void invoke(Request request, Response response) throws IOException, Servl
     try {
       getNext().invoke(request, response);
     } finally {
-      final Session session = request.getSessionInternal(false);
-      storeOrRemoveSession(session);
       manager.afterRequest();
     }
   }
-
-  private void storeOrRemoveSession(Session session) {
-    try {
-      if (session != null) {
-        if (session.isValid()) {
-          log.trace("Request with session completed, saving session " + session.getId());
-          if (session.getSession() != null) {
-            log.trace("HTTP Session present, saving " + session.getId());
-            manager.save(session, manager.getAlwaysSaveAfterRequest());
-          } else {
-            log.trace("No HTTP Session present, Not saving " + session.getId());
-          }
-        } else {
-          log.trace("HTTP Session has been invalidated, removing :" + session.getId());
-          manager.remove(session);
-        }
-      }
-    } catch (Exception e) {
-      log.error("Error storing/removing session", e);
-    }
-  }
 }

src/main/java/com/orangefunction/tomcat/redissessions/RedisSessionManager.java

@@ -624,10 +624,22 @@ public void remove(Session session, boolean update) {
   public void afterRequest() {
     RedisSession redisSession = currentSession.get();
     if (redisSession != null) {
-      currentSession.remove();
-      currentSessionId.remove();
-      currentSessionIsPersisted.remove();
-      log.trace("Session removed from ThreadLocal :" + redisSession.getIdInternal());
+      try {
+        if (redisSession.isValid()) {
+          log.trace("Request with session completed, saving session " + redisSession.getId());
+          save(redisSession, getAlwaysSaveAfterRequest());
+        } else {
+          log.trace("HTTP Session has been invalidated, removing :" + redisSession.getId());
+          remove(redisSession);
+        }
+      } catch (Exception e) {
+        log.error("Error storing/removing session", e);
+      } finally {
+        currentSession.remove();
+        currentSessionId.remove();
+        currentSessionIsPersisted.remove();
+        log.trace("Session removed from ThreadLocal :" + redisSession.getIdInternal());
+      }
     }
   }