ATS-23

appNG · Apr 3, 2020 · cb966e8 · cb966e8
1 parent af8c54f
commit cb966e8
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/org/appng/tomcat/session/mongo/MongoStore.java b/src/main/java/org/appng/tomcat/session/mongo/MongoStore.java
@@ -366,6 +366,9 @@ private DBObject getMongoSession(String id) {
 			mongoSession = this.collection.findOne(sessionQuery);
 		} else {
 			mongoSession = this.collection.findOne(sessionQuery);
+			if (null == mongoSession) {
+				return null;
+			}
 			while (waited < maxWaitTime && mongoSession.get(HOST_PROPERTY) != null) {
 				info("Session %s is still used by host %s, waiting %sms.", id, mongoSession.get(HOST_PROPERTY),
 						waitTime);