Skip to content
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

Jump to bottom

Fixing the Concurrent Modification and clearAcks() logic #770

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fixing the Concurrent Modification and clearAcks() logic #770

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc9d956
Fixing Issue #727, #710, #759
Harsh5488 Jul 8, 2024
98585ea
cleanup
darrachequesne Jul 10, 2024
bc92d64
Merge branch 'socketio:main' into main
Harsh5488 Jul 29, 2024
94a5fae
• Using ConcurrentHashMap for multi-threaded environment
Harsh5488 Jul 29, 2024
f55d0c1
• Making clearAcks() public for clearing acknowledgement when needed
Harsh5488 Jul 29, 2024
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
6 changes: 3 additions & 3 deletions src/main/java/io/socket/client/Socket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.json.JSONObject;

import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down Expand Up @@ -59,7 +60,7 @@ public class Socket extends Emitter {
private String nsp;
private Manager io;
private Map<String, String> auth;
private Map<Integer, Ack> acks = new HashMap<>();
private Map<Integer, Ack> acks = new ConcurrentHashMap<>();
private Queue<On.Handle> subs;
private final Queue<List<Object>> receiveBuffer = new ConcurrentLinkedQueue<>();
private final Queue<Packet<JSONArray>> sendBuffer = new ConcurrentLinkedQueue<>();
Expand Down Expand Up @@ -283,14 +284,13 @@ private void onclose(String reason) {
this.connected = false;
this.id = null;
super.emit(EVENT_DISCONNECT, reason);
this.clearAcks();
}

/**
* Clears the acknowledgement handlers upon disconnection, since the client will never receive an acknowledgement from
* the server.
*/
private void clearAcks() {
public void clearAcks() {
for (Ack ack : this.acks.values()) {
if (ack instanceof AckWithTimeout) {
((AckWithTimeout) ack).onTimeout();
Expand Down
Loading