Use dedicated methods to remove value from SessionStore

Some containers session manager expects non-null values when setting attributes. Closes #22
pac4j · Jun 17, 2017 · 4e0c6d9 · 4e0c6d9
1 parent bec8ddc
commit 4e0c6d9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/org/pac4j/jax/rs/grizzly/pac4j/GrizzlySessionStore.java b/src/main/java/org/pac4j/jax/rs/grizzly/pac4j/GrizzlySessionStore.java
@@ -32,7 +32,11 @@ public Object get(JaxRsContext context, String key) {
 
     @Override
     public void set(JaxRsContext context, String key, Object value) {
-        getSession(context).setAttribute(key, value);
+        if (value == null) {
+            getSession(context).removeAttribute(key);
+        } else {
+            getSession(context).setAttribute(key, value);
+        }
     }
 
     @Override

diff --git a/src/main/java/org/pac4j/jax/rs/servlet/pac4j/ServletSessionStore.java b/src/main/java/org/pac4j/jax/rs/servlet/pac4j/ServletSessionStore.java
@@ -34,7 +34,11 @@ public Object get(JaxRsContext context, String key) {
 
     @Override
     public void set(JaxRsContext context, String key, Object value) {
-        getHttpSession(context).setAttribute(key, value);
+        if (value == null) {
+            getHttpSession(context).removeAttribute(key);
+        } else {
+            getHttpSession(context).setAttribute(key, value);
+        }
     }
 
     @Override