Fixed NPE in RedissonSession.save #1149

7 years ago · 65ac6f33db
parent f034500825
commit 65ac6f33db
3 changed files with 12 additions and 6 deletions
--- a/redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSession.java
+++ b/redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSession.java
@ -167,8 +167,10 @@ public class RedissonSession extends StandardSession {
        newMap.put("session:isValid", isValid);
        newMap.put("session:isNew", isNew);
        
-        for (Entry<String, Object> entry : attrs.entrySet()) {
-            newMap.put(entry.getKey(), entry.getValue());
+        if (attrs != null) {
+            for (Entry<String, Object> entry : attrs.entrySet()) {
+                newMap.put(entry.getKey(), entry.getValue());
+            }
        }
        
        map.putAll(newMap);
--- 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
@ -171,8 +171,10 @@ public class RedissonSession extends StandardSession {
        newMap.put("session:isValid", isValid);
        newMap.put("session:isNew", isNew);
        
-        for (Entry<String, Object> entry : attrs.entrySet()) {
-            newMap.put(entry.getKey(), entry.getValue());
+        if (attrs != null) {
+            for (Entry<String, Object> entry : attrs.entrySet()) {
+                newMap.put(entry.getKey(), entry.getValue());
+            }
        }
        
        map.putAll(newMap);
--- 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
@ -172,8 +172,10 @@ public class RedissonSession extends StandardSession {
        newMap.put("session:isValid", isValid);
        newMap.put("session:isNew", isNew);
        
-        for (Entry<String, Object> entry : attrs.entrySet()) {
-            newMap.put(entry.getKey(), entry.getValue());
+        if (attrs != null) {
+            for (Entry<String, Object> entry : attrs.entrySet()) {
+                newMap.put(entry.getKey(), entry.getValue());
+            }
        }
        
        map.putAll(newMap);