Fixed - UpdateValve throws NullPointerException if url context doesn't exist. #3047

4 years ago · 699d2f33df
parent 62b5e68c05
commit 699d2f33df
6 changed files with 33 additions and 15 deletions
--- a/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/UpdateValve.java
+++ b/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/UpdateValve.java
@ -51,6 +51,10 @@ public class UpdateValve extends ValveBase {
                getNext().invoke(request, response);
            } finally {
                request.removeNote(ALREADY_FILTERED_NOTE);
+                if (request.getContext() == null) {
+                    return;
+                }
+
                final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
                try {
                    ClassLoader applicationClassLoader = request.getContext().getLoader().getClassLoader();
--- a/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/UsageValve.java
+++ b/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/UsageValve.java
@ -48,11 +48,13 @@ public class UsageValve extends ValveBase {
            request.setNote(ALREADY_FILTERED_NOTE, Boolean.TRUE);
            RedissonSession s = null;
            try {
-                HttpSession session = request.getSession(false);
-                if (session != null) {
-                    s = (RedissonSession) request.getContext().getManager().findSession(session.getId());
-                    if (s != null) {
-                        s.startUsage();
+                if (request.getContext() != null) {
+                    HttpSession session = request.getSession(false);
+                    if (session != null) {
+                        s = (RedissonSession) request.getContext().getManager().findSession(session.getId());
+                        if (s != null) {
+                            s.startUsage();
+                        }
                    }
                }

--- a/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/UpdateValve.java
+++ b/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/UpdateValve.java
@ -51,6 +51,10 @@ public class UpdateValve extends ValveBase {
                getNext().invoke(request, response);
            } finally {
                request.removeNote(ALREADY_FILTERED_NOTE);
+                if (request.getContext() == null) {
+                    return;
+                }
+
                final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
                try {
                    ClassLoader applicationClassLoader = request.getContext().getLoader().getClassLoader();
--- a/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/UsageValve.java
+++ b/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/UsageValve.java
@ -48,11 +48,13 @@ public class UsageValve extends ValveBase {
            request.setNote(ALREADY_FILTERED_NOTE, Boolean.TRUE);
            RedissonSession s = null;
            try {
-                HttpSession session = request.getSession(false);
-                if (session != null) {
-                    s = (RedissonSession) request.getContext().getManager().findSession(session.getId());
-                    if (s != null) {
-                        s.startUsage();
+                if (request.getContext() != null) {
+                    HttpSession session = request.getSession(false);
+                    if (session != null) {
+                        s = (RedissonSession) request.getContext().getManager().findSession(session.getId());
+                        if (s != null) {
+                            s.startUsage();
+                        }
                    }
                }

--- a/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/UpdateValve.java
+++ b/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/UpdateValve.java
@ -51,6 +51,10 @@ public class UpdateValve extends ValveBase {
                getNext().invoke(request, response);
            } finally {
                request.removeNote(ALREADY_FILTERED_NOTE);
+                if (request.getContext() == null) {
+                    return;
+                }
+
                final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
                try {
                    ClassLoader applicationClassLoader = request.getContext().getLoader().getClassLoader();
--- a/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/UsageValve.java
+++ b/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/UsageValve.java
@ -48,11 +48,13 @@ public class UsageValve extends ValveBase {
            request.setNote(ALREADY_FILTERED_NOTE, Boolean.TRUE);
            RedissonSession s = null;
            try {
-                HttpSession session = request.getSession(false);
-                if (session != null) {
-                    s = (RedissonSession) request.getContext().getManager().findSession(session.getId());
-                    if (s != null) {
-                        s.startUsage();
+                if (request.getContext() != null) {
+                    HttpSession session = request.getSession(false);
+                    if (session != null) {
+                        s = (RedissonSession) request.getContext().getManager().findSession(session.getId());
+                        if (s != null) {
+                            s.startUsage();
+                        }
                    }
                }