From 69e8de3e99354f16a411c67a456d0feff17c9c1b Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Fri, 1 Aug 2014 15:12:13 +0200
Subject: [PATCH] Fix NPE
---
.../java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index 63e5858ac..0bb5b2e37 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -111,6 +111,11 @@ public class ARSnovaSocketIOServer {
@Override
public void onData(SocketIOClient client, Session session, AckRequest ackSender) {
User u = userService.getUser2SocketId(client.getSessionId());
+ if (null == u) {
+ LOGGER.info("Client {} requested to join session but is not mapped to a user", client.getSessionId());
+
+ return;
+ }
String oldSessionKey = userService.getSessionForUser(u.getUsername());
if (session.getKeyword() == oldSessionKey) {
return;
--
GitLab