Skip to content

Commit 0b5cf95

Browse files
committed
fixed: ConcurrentModificationException #115
1 parent 4ded410 commit 0b5cf95

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

src/main/java/com/pusher/client/connection/websocket/WebSocketConnection.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
11
package com.pusher.client.connection.websocket;
22

3-
import com.google.gson.Gson;
4-
import com.pusher.client.connection.ConnectionEventListener;
5-
import com.pusher.client.connection.ConnectionState;
6-
import com.pusher.client.connection.ConnectionStateChange;
7-
import com.pusher.client.connection.impl.InternalConnection;
8-
import com.pusher.client.util.Factory;
9-
10-
import org.java_websocket.client.WebSocketClient;
11-
import org.java_websocket.handshake.ServerHandshake;
12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
14-
153
import java.net.Proxy;
164
import java.net.URI;
175
import java.net.URISyntaxException;
186
import java.util.Collections;
7+
import java.util.HashMap;
198
import java.util.HashSet;
209
import java.util.Map;
2110
import java.util.Set;
@@ -25,6 +14,19 @@
2514

2615
import javax.net.ssl.SSLException;
2716

17+
import org.java_websocket.client.WebSocketClient;
18+
import org.java_websocket.handshake.ServerHandshake;
19+
import org.slf4j.Logger;
20+
import org.slf4j.LoggerFactory;
21+
22+
import com.google.gson.Gson;
23+
24+
import com.pusher.client.connection.ConnectionEventListener;
25+
import com.pusher.client.connection.ConnectionState;
26+
import com.pusher.client.connection.ConnectionStateChange;
27+
import com.pusher.client.connection.impl.InternalConnection;
28+
import com.pusher.client.util.Factory;
29+
2830
public class WebSocketConnection implements InternalConnection, WebSocketListener {
2931
private static final Logger log = LoggerFactory.getLogger(WebSocketConnection.class);
3032
private static final Gson GSON = new Gson();
@@ -54,7 +56,7 @@ public WebSocketConnection(
5456
this.factory = factory;
5557

5658
for (final ConnectionState state : ConnectionState.values()) {
57-
eventListeners.put(state, Collections.newSetFromMap(new ConcurrentHashMap<ConnectionEventListener, Boolean>()));
59+
eventListeners.put(state, Collections.newSetFromMap(new HashMap<ConnectionEventListener, Boolean>()));
5860
}
5961
}
6062

0 commit comments

Comments
 (0)