Tomcat 7.0.48-dev WebSockets: NullPointerException on WsServerContainer.unregisterAuthenticatedSession

[Francesco Bassi]

Hello everybody.

I have a doubt:

whenever the HttpSession expires, I get a NullPointerException on
WsServerContainer.unregisterAuthenticatedSession

in this line:

    private void unregisterAuthenticatedSession(WsSession wsSession,
            String httpSessionId) {
        Set<WsSession> wsSessions =
authenticatedSessions.get(httpSessionId);
-->        wsSessions.remove(wsSession);
    }


The quick fix is obvious:

    private void unregisterAuthenticatedSession(WsSession wsSession,
            String httpSessionId) {
        Set<WsSession> wsSessions =
authenticatedSessions.get(httpSessionId);
        if(wsSessions!=null) wsSessions.remove(wsSession);
    }

but I suspect that the error is elsewhere.

What do you think?