From 542b3316fd6fe62e24d58142fe7abe854787e564 Mon Sep 17 00:00:00 2001
From: agrt56 <andreas.gaertner@mni.thm.de>
Date: Wed, 3 Jun 2015 01:48:37 +0200
Subject: [PATCH] Fix NullPointerException on client session logout.

---
 src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index 62b3b23ff..1283b2664 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -187,7 +187,7 @@ public class ARSnovaSocketIOServer implements ARSnovaSocket, NovaEventVisitor {
 					return;
 				}
 				final String oldSessionKey = userService.getSessionForUser(u.getUsername());
-				if (session.getKeyword().equals(oldSessionKey)) {
+				if (null != session.getKeyword() && session.getKeyword().equals(oldSessionKey)) {
 					return;
 				}
 
-- 
GitLab