Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Aug 4, 2020 · dbeac5e · dbeac5e
2 parents fe56838 + 8af767f
commit dbeac5e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...t-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java b/...t-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java
@@ -19,8 +19,10 @@
 package org.eclipse.jetty.websocket.javax.common;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 import javax.websocket.CloseReason;
 import javax.websocket.Session;
@@ -30,12 +32,12 @@
 
 public class SessionTracker extends AbstractLifeCycle implements JavaxWebSocketSessionListener, Graceful
 {
-    private final CopyOnWriteArraySet<JavaxWebSocketSession> sessions = new CopyOnWriteArraySet<>();
+    private final Set<JavaxWebSocketSession> sessions = Collections.newSetFromMap(new ConcurrentHashMap<>());
     private boolean isShutdown = false;
 
     public Set<Session> getSessions()
     {
-        return Collections.unmodifiableSet(sessions);
+        return Set.copyOf(sessions);
     }
 
     @Override

diff --git a/...bsocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java b/...bsocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java
@@ -19,8 +19,12 @@
 package org.eclipse.jetty.websocket.common;
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
@@ -31,12 +35,12 @@
 
 public class SessionTracker extends AbstractLifeCycle implements WebSocketSessionListener, Graceful
 {
-    private final List<Session> sessions = new CopyOnWriteArrayList<>();
+    private final Set<Session> sessions = Collections.newSetFromMap(new ConcurrentHashMap<>());
     private boolean isShutdown = false;
 
     public Collection<Session> getSessions()
     {
-        return sessions;
+        return Set.copyOf(sessions);
     }
 
     @Override