Merge pull request #1930 from lift/issue-1929

Adding a null guard
lift · Dec 14, 2017 · 66d1a6d · 66d1a6d
2 parents 8e55bae + 2175135
commit 66d1a6d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/web/webkit/src/main/scala/net/liftweb/http/SessionMaster.scala b/web/webkit/src/main/scala/net/liftweb/http/SessionMaster.scala
@@ -199,7 +199,7 @@ object SessionMaster extends LiftActor with Loggable {
   def isDead(sessionId: String): Boolean = killedSessions.containsKey(sessionId)
 
   private val reaction: PartialFunction[Any, Unit] = {
-    case RemoveSession(sessionId) =>
+    case RemoveSession(sessionId) if sessionId != null =>
 
       val ses = lockRead(nsessions)
       (Box !! ses.get(sessionId)).foreach {