From 0161167e1793be3a7893811b7767827f99c5ab33 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Sat, 9 Mar 2013 15:10:44 +0100
Subject: [PATCH] Fixed possible NullPointerException.

---
 src/main/java/de/thm/arsnova/services/UserService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index 5e9f3c9b5..84d952172 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -191,6 +191,11 @@ public class UserService implements IUserService, InitializingBean, DisposableBe
 	@Transactional(isolation = Isolation.READ_COMMITTED)
 	public void removeUserFromSessionBySocketId(UUID socketId) {
 		User user = socketid2user.get(socketId);
+		if (null == user) {
+			LOGGER.warn("null == user for socket {}", socketId);
+
+			return;
+		}
 		user2session.remove(user);
 	}
 
-- 
GitLab