From 9fbad3b6f579f9690ceb51ef192f2514eea86e71 Mon Sep 17 00:00:00 2001
From: Etienne Hardy <etienne.hardy@appdirect.com>
Date: Tue, 9 Jul 2024 09:19:03 -0400
Subject: [PATCH] Making sure that redisson:tomcat_notified_nodes keys get an
 expiration on SessionDestroyedMessage.

Replicating the expiration set RedissonSession.delete().

Signed-off-by: Etienne Hardy <etienne.hardy@appdirect.com>
---
 .../main/java/org/redisson/tomcat/RedissonSessionManager.java   | 2 ++
 .../main/java/org/redisson/tomcat/RedissonSessionManager.java   | 2 ++
 .../main/java/org/redisson/tomcat/RedissonSessionManager.java   | 2 ++
 .../main/java/org/redisson/tomcat/RedissonSessionManager.java   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
index ff211bc80..c2142bfee 100644
--- a/redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
+++ b/redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
@@ -34,6 +34,7 @@ import org.redisson.pubsub.PublishSubscribeService;
 
 import java.io.File;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.*;
 
 /**
@@ -335,6 +336,7 @@ public class RedissonSessionManager extends ManagerBase {
                                 }
                                 RSet<String> set = getNotifiedNodes(msg.getSessionId());
                                 set.add(nodeId);
+                                set.expire(Duration.ofSeconds(60));
                             }
                             
                         }
diff --git a/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
index 1cc200d2b..2ba6752fc 100644
--- a/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
+++ b/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
@@ -34,6 +34,7 @@ import org.redisson.pubsub.PublishSubscribeService;
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.*;
 
 /**
@@ -335,6 +336,7 @@ public class RedissonSessionManager extends ManagerBase {
                                 }
                                 RSet<String> set = getNotifiedNodes(msg.getSessionId());
                                 set.add(nodeId);
+                                set.expire(Duration.ofSeconds(60));
                             }
                             
                         }
diff --git a/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
index d1475c484..c2a1dbd97 100644
--- a/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
+++ b/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
@@ -34,6 +34,7 @@ import org.redisson.pubsub.PublishSubscribeService;
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.*;
 
 /**
@@ -335,6 +336,7 @@ public class RedissonSessionManager extends ManagerBase {
                                 }
                                 RSet<String> set = getNotifiedNodes(msg.getSessionId());
                                 set.add(nodeId);
+                                set.expire(Duration.ofSeconds(60));
                             }
                             
                         }
diff --git a/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
index d1475c484..c2a1dbd97 100644
--- a/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
+++ b/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
@@ -34,6 +34,7 @@ import org.redisson.pubsub.PublishSubscribeService;
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.*;
 
 /**
@@ -335,6 +336,7 @@ public class RedissonSessionManager extends ManagerBase {
                                 }
                                 RSet<String> set = getNotifiedNodes(msg.getSessionId());
                                 set.add(nodeId);
+                                set.expire(Duration.ofSeconds(60));
                             }
                             
                         }