Fixed - RedissonSession.setValid(false) can recreate Tomcat session. Session validity checking improved. #974

redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSession.java

@@ -113,6 +113,10 @@ public class RedissonSession extends StandardSession {
         super.setValid(isValid);
         
         if (map != null) {
+            if (!isValid && !map.isExists()) {
+                return;
+            }
+
             map.fastPut("session:isValid", isValid);
         }
     }

redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSessionManager.java

@@ -127,7 +127,7 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle {
         Session result = super.findSession(id);
         if (result == null && id != null) {
             Map<String, Object> attrs = getMap(id).readAllMap();
-            if (attrs.isEmpty()) {
+            if (attrs.isEmpty() || !Boolean.valueOf(String.valueOf(attrs.get("session:isValid")))) {
                 log.info("Session " + id + " can't be found");
                 return null;
             }

redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSession.java

@@ -117,6 +117,10 @@ public class RedissonSession extends StandardSession {
         super.setValid(isValid);
         
         if (map != null) {
+            if (!isValid && !map.isExists()) {
+                return;
+            }
+
             map.fastPut("session:isValid", isValid);
         }
     }

redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java

@@ -105,7 +105,7 @@ public class RedissonSessionManager extends ManagerBase {
         Session result = super.findSession(id);
         if (result == null && id != null) {
             Map<String, Object> attrs = getMap(id).readAllMap();
-            if (attrs.isEmpty()) {
+            if (attrs.isEmpty() || !Boolean.valueOf(String.valueOf(attrs.get("session:isValid")))) {
                 log.info("Session " + id + " can't be found");
                 return null;
             }

redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSession.java

@@ -118,6 +118,10 @@ public class RedissonSession extends StandardSession {
         super.setValid(isValid);
         
         if (map != null) {
+            if (!isValid && !map.isExists()) {
+                return;
+            }
+            
             map.fastPut("session:isValid", isValid);
         }
     }

redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java

@@ -105,7 +105,8 @@ public class RedissonSessionManager extends ManagerBase {
         Session result = super.findSession(id);
         if (result == null && id != null) {
             Map<String, Object> attrs = getMap(id).readAllMap();
-            if (attrs.isEmpty()) {
+            
+            if (attrs.isEmpty() || !Boolean.valueOf(String.valueOf(attrs.get("session:isValid")))) {
                 log.info("Session " + id + " can't be found");
                 return null;
             }