Skip to content

Commit 01cea3b

Browse files
author
tox
committed
SocketIO now supports multiple connections to the same namespace.
1 parent d54131f commit 01cea3b

2 files changed

Lines changed: 28 additions & 15 deletions

File tree

‎src/io/socket/IOConnection.java‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.net.URLConnection;
1616
import java.util.Arrays;
1717
import java.util.HashMap;
18+
import java.util.LinkedList;
1819
import java.util.List;
1920
import java.util.Scanner;
2021
import java.util.Timer;
@@ -55,7 +56,7 @@ class IOConnection {
5556
public static final String SOCKET_IO_1 = "/socket.io/1/";
5657

5758
/** All available connections. */
58-
private static HashMap<String, IOConnection> connections = new HashMap<String, IOConnection>();
59+
private static HashMap<String, List<IOConnection>> connections = new HashMap<String, List<IOConnection>>();
5960

6061
/** The url for this connection. */
6162
private URL url;
@@ -234,13 +235,20 @@ private void handshake() {
234235
* @return a IOConnection object
235236
*/
236237
static public IOConnection register(String origin, SocketIO socket) {
237-
IOConnection connection = connections.get(origin);
238-
if (connection == null) {
239-
connection = new IOConnection(origin, socket);
240-
connections.put(origin, connection);
241-
} else {
242-
connection.register(socket);
238+
List<IOConnection> list = connections.get(origin);
239+
if(list == null) {
240+
list = new LinkedList<IOConnection>();
241+
connections.put(origin, list);
243242
}
243+
else {
244+
for(IOConnection connection : list) {
245+
if(connection.register(socket))
246+
return connection;
247+
}
248+
}
249+
250+
IOConnection connection = new IOConnection(origin, socket);
251+
list.add(connection);
244252
return connection;
245253
}
246254

@@ -351,20 +359,16 @@ protected void error(SocketIOException e) {
351359
* @param socket
352360
* the socket to be connected
353361
*/
354-
public void register(SocketIO socket) {
362+
public boolean register(SocketIO socket) {
355363
String namespace = socket.getNamespace();
356364
if (sockets.containsKey(namespace))
357-
socket.getCallback()
358-
.onError(
359-
new SocketIOException(
360-
"Namespace '"
361-
+ namespace
362-
+ "' is already registered. Do not try to connect twice to the same url."));
365+
return false;
363366
else {
364367
sockets.put(namespace, socket);
365368
IOMessage connect = new IOMessage(IOMessage.TYPE_CONNECT,
366369
socket.getNamespace(), "");
367370
sendPlain(connect.toString());
371+
return true;
368372
}
369373
}
370374

‎tests/io/socket/TestSocketIO.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
@RunWith(io.socket.RandomBlockJUnit4ClassRunner.class)
2323
public class TestSocketIO implements IOCallback {
24-
private final static String NODE = "/opt/local/bin/node";
24+
private final static String NODE = "C:\\Program Files (x86)\\nodejs\\node.exe";
2525
private static final int PORT = 10214;
2626
private static final int TIMEOUT = 2;
2727
LinkedBlockingQueue<String> events;
@@ -199,9 +199,18 @@ public void namespaces() throws Exception {
199199

200200
assertEquals("onMessage_string", takeEvent());
201201
assertEquals("ns2", takeArg());
202+
203+
SocketIO ns2_2 = new SocketIO("http://127.0.0.1:" + PORT + "/ns2", this);
204+
assertEquals("onConnect", takeEvent());
202205

206+
assertEquals("onMessage_string", takeEvent());
207+
assertEquals("ns2", takeArg());
208+
209+
ns2_2.disconnect();
210+
203211
ns2.disconnect();
204212
assertEquals("onDisconnect", takeEvent());
213+
assertEquals("onDisconnect", takeEvent());
205214
doClose();
206215
}
207216

0 commit comments

Comments
 (0)