Fixed - Tomcat session getAttributeNames() method doesn't take in account localcached attributes #3057

4 years ago · 2e9094af01
parent 62d968559d
commit 2e9094af01
3 changed files with 15 additions and 3 deletions
--- a/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSession.java
+++ b/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSession.java
@ -145,7 +145,11 @@ public class RedissonSession extends StandardSession {
                throw new IllegalStateException
                    (sm.getString("standardSession.getAttributeNames.ise"));
            }
-            return Collections.enumeration(map.readAllKeySet());
+
+            Set<String> attributeKeys = new HashSet<>();
+            attributeKeys.addAll(map.readAllKeySet());
+            attributeKeys.addAll(loadedAttributes.keySet());
+            return Collections.enumeration(attributeKeys);
        }
        
        return super.getAttributeNames();
--- a/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSession.java
+++ b/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSession.java
@ -145,7 +145,11 @@ public class RedissonSession extends StandardSession {
                throw new IllegalStateException
                    (sm.getString("standardSession.getAttributeNames.ise"));
            }
-            return Collections.enumeration(map.readAllKeySet());
+
+            Set<String> attributeKeys = new HashSet<>();
+            attributeKeys.addAll(map.readAllKeySet());
+            attributeKeys.addAll(loadedAttributes.keySet());
+            return Collections.enumeration(attributeKeys);
        }
        
        return super.getAttributeNames();
--- a/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSession.java
+++ b/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSession.java
@ -145,7 +145,11 @@ public class RedissonSession extends StandardSession {
                throw new IllegalStateException
                    (sm.getString("standardSession.getAttributeNames.ise"));
            }
-            return Collections.enumeration(map.readAllKeySet());
+
+            Set<String> attributeKeys = new HashSet<>();
+            attributeKeys.addAll(map.readAllKeySet());
+            attributeKeys.addAll(loadedAttributes.keySet());
+            return Collections.enumeration(attributeKeys);
        }
        
        return super.getAttributeNames();