WebSocketRegistryListener handles null Session in SessionDisconnectEvent

Fixes gh-77
2014-12-12 15:26:07 -06:00
parent c7e9c698a5
commit 0b403c3313
2 changed files with 13 additions and 0 deletions
--- a/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java
+++ b/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java
@@ -84,6 +84,9 @@ public final class WebSocketRegistryListener implements ApplicationListener<Appl
    }

    private void afterConnectionClosed(String httpSessionId, String wsSessionId) {
+        if(httpSessionId == null) {
+            return;
+        }

        Map<String,WebSocketSession> sessions = httpSessionIdToWsSessions.get(httpSessionId);
        if(sessions != null) {