From 1f6e57c164696f27e9171bf21b4846ee236ae05d Mon Sep 17 00:00:00 2001
From: Ranjith Manickam <ranji3886@gmail.com>
Date: Wed, 13 May 2020 11:02:21 +0530
Subject: [PATCH] Fix for - NPE in SessionHandlerValve.java accessing Tomcat's
 /manager app

---
 .../tomcat/request/session/redis/SessionHandlerValve.java     | 4 +++-
 .../java/tomcat/request/session/redis/SingleSignOnValve.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/tomcat/request/session/redis/SessionHandlerValve.java b/src/main/java/tomcat/request/session/redis/SessionHandlerValve.java
index aa891bc..7d6a347 100644
--- a/src/main/java/tomcat/request/session/redis/SessionHandlerValve.java
+++ b/src/main/java/tomcat/request/session/redis/SessionHandlerValve.java
@@ -31,7 +31,9 @@ public class SessionHandlerValve extends ValveBase {
             LOGGER.error("Error processing request", ex);
             throw new BackendException();
         } finally {
-            this.manager.afterRequest();
+            if (this.manager != null) {
+                this.manager.afterRequest();
+            }
         }
     }
 }
diff --git a/src/main/java/tomcat/request/session/redis/SingleSignOnValve.java b/src/main/java/tomcat/request/session/redis/SingleSignOnValve.java
index 49f58c1..cd4bae8 100644
--- a/src/main/java/tomcat/request/session/redis/SingleSignOnValve.java
+++ b/src/main/java/tomcat/request/session/redis/SingleSignOnValve.java
@@ -225,7 +225,9 @@ public class SingleSignOnValve extends SingleSignOn {
 
     /** To set session manager. */
     void setSessionManager(Manager manager) {
-        this.manager = (SessionManager) manager;
+        if (manager != null) {
+            this.manager = (SessionManager) manager;
+        }
     }
 
     /** To expire session. */