From 68d9ede5b9b9bb5bb1b942089eb5cbd067811974 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Thu, 20 Jun 2019 09:28:25 +0300
Subject: [PATCH] Fixed - RedissonSession.setAttribute method doesn't check the
 value for null #2187 (thanks to jchobantonov)

---
 .../src/main/java/org/redisson/tomcat/RedissonSession.java | 5 ++++-
 .../src/main/java/org/redisson/tomcat/RedissonSession.java | 5 ++++-
 .../src/main/java/org/redisson/tomcat/RedissonSession.java | 7 +++++--
 .../src/main/java/org/redisson/tomcat/RedissonSession.java | 5 ++++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git 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
index 8adcf1a13..3443f4ff2 100644
--- 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
@@ -281,7 +281,10 @@ public class RedissonSession extends StandardSession {
     public void setAttribute(String name, Object value, boolean notify) {
         super.setAttribute(name, value, notify);
         
-        if (updateMode == UpdateMode.DEFAULT && map != null && value != null) {
+        if (value == null) {
+            return;
+        }
+        if (updateMode == UpdateMode.DEFAULT && map != null) {
             fastPut(name, value);
         }
         if (updateMode == UpdateMode.AFTER_REQUEST) {
diff --git 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
index 4f13b69bc..8ab86cadc 100644
--- 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
@@ -281,7 +281,10 @@ public class RedissonSession extends StandardSession {
     public void setAttribute(String name, Object value, boolean notify) {
         super.setAttribute(name, value, notify);
         
-        if (updateMode == UpdateMode.DEFAULT && map != null && value != null) {
+        if (value == null) {
+            return;
+        }
+        if (updateMode == UpdateMode.DEFAULT && map != null) {
             fastPut(name, value);
         }
         if (updateMode == UpdateMode.AFTER_REQUEST) {
diff --git 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
index e1247d70b..f053167ab 100644
--- 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
@@ -280,8 +280,11 @@ public class RedissonSession extends StandardSession {
     @Override
     public void setAttribute(String name, Object value, boolean notify) {
         super.setAttribute(name, value, notify);
-        
-        if (updateMode == UpdateMode.DEFAULT && map != null && value != null) {
+
+        if (value == null) {
+            return;
+        }
+        if (updateMode == UpdateMode.DEFAULT && map != null) {
             fastPut(name, value);
         }
         if (updateMode == UpdateMode.AFTER_REQUEST) {
diff --git 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
index e1247d70b..2dddb1feb 100644
--- 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
@@ -281,7 +281,10 @@ public class RedissonSession extends StandardSession {
     public void setAttribute(String name, Object value, boolean notify) {
         super.setAttribute(name, value, notify);
         
-        if (updateMode == UpdateMode.DEFAULT && map != null && value != null) {
+        if (value == null) {
+            return;
+        }
+        if (updateMode == UpdateMode.DEFAULT && map != null) {
             fastPut(name, value);
         }
         if (updateMode == UpdateMode.AFTER_REQUEST) {
-- 
GitLab