You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/11/28 15:29:31 UTC
svn commit: r1546373 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/tomcat/websocket/server/WsServerContainer.java
webapps/docs/changelog.xml
Author: markt
Date: Thu Nov 28 14:29:31 2013
New Revision: 1546373
URL: http://svn.apache.org/r1546373
Log:
Fix NPE reported on users list when HTTP session ends
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1546372
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1546373&r1=1546372&r2=1546373&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Thu Nov 28 14:29:31 2013
@@ -406,7 +406,10 @@ public class WsServerContainer extends W
private void unregisterAuthenticatedSession(WsSession wsSession,
String httpSessionId) {
Set<WsSession> wsSessions = authenticatedSessions.get(httpSessionId);
- wsSessions.remove(wsSession);
+ // wsSessions will be null if the HTTP session has ended
+ if (wsSessions != null) {
+ wsSessions.remove(wsSession);
+ }
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1546373&r1=1546372&r2=1546373&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Nov 28 14:29:31 2013
@@ -185,6 +185,10 @@
descriptor may contain configuration necessary for secure operation
such as a <code>RemoteAddrValve</code>. (markt)
</add>
+ <fix>
+ Prevent an NPE in the WebSocket <code>ServerContainer</code> when
+ processing an HTTP session end event. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org