svn commit: r1447175 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

[markt]

Author: markt
Date: Mon Feb 18 09:55:16 2013
New Revision: 1447175

URL: http://svn.apache.org/r1447175
Log:
Need to lock on read too

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1447175&r1=1447174&r2=1447175&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon 
Feb 18 09:55:16 2013
@@ -221,9 +221,11 @@ public class WsWebSocketContainer
 
     Set<Session> getOpenSessions(Class<?> endpoint) {
         HashSet<Session> result = new HashSet<>();
-        Set<WsSession> sessions = endpointSessionMap.get(endpoint);
-        if (sessions != null) {
-            result.addAll(sessions);
+        synchronized (endPointSessionMapLock) {
+            Set<WsSession> sessions = endpointSessionMap.get(endpoint);
+            if (sessions != null) {
+                result.addAll(sessions);
+            }
         }
         return result;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org