Fix NPE in DefaultSimpUserRegistry

2015-05-22 13:43:02 -04:00
parent 92bd7bba50
commit c48e8708a7
4 changed files with 24 additions and 8 deletions
--- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistry.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistry.java
@@ -178,7 +178,7 @@ public class DefaultSimpUserRegistry implements SimpUserRegistry, SmartApplicati

 		@Override
 		public SimpSession getSession(String sessionId) {
-			return this.sessions.get(sessionId);
+			return (sessionId != null ? this.sessions.get(sessionId) : null);
 		}

 		@Override