diff --git a/src/main/java/org/appng/tomcat/session/mongo/MongoStore.java b/src/main/java/org/appng/tomcat/session/mongo/MongoStore.java index ddb016a..99f9d00 100644 --- 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);