Skip to content

[JENKINS-69543] Fix thread safety in websockets handling. #7076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
basil merged 1 commit into from
Sep 8, 2022
Merged

[JENKINS-69543] Fix thread safety in websockets handling. #7076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion websocket/jetty10/src/main/java/jenkins/websocket/Jetty10Provider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.concurrent.CompletableFuture;
Expand All @@ -49,7 +50,7 @@ public class Jetty10Provider implements Provider {
private static final String ATTR_LISTENER = Jetty10Provider.class.getName() + ".listener";

// TODO does not seem possible to use HttpServletRequest.get/setAttribute for this
private static final Map<Listener, Session> sessions = new WeakHashMap<>();
private static final Map<Listener, Session> sessions = Collections.synchronizedMap(new WeakHashMap<>());

public Jetty10Provider() {
JettyWebSocketServerContainer.class.hashCode();
Expand Down
3 changes: 2 additions & 1 deletion websocket/jetty9/src/main/java/jenkins/websocket/Jetty9Provider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.concurrent.Future;
Expand All @@ -48,7 +49,7 @@ public class Jetty9Provider implements Provider {
private static final String ATTR_LISTENER = Jetty9Provider.class.getName() + ".listener";

// TODO does not seem possible to use HttpServletRequest.get/setAttribute for this
private static final Map<Listener, Session> sessions = new WeakHashMap<>();
private static final Map<Listener, Session> sessions = Collections.synchronizedMap(new WeakHashMap<>());

private WebSocketServletFactory factory;

Expand Down