fixed a problem with the socket.io lib causing a possible deadlock du…

…ring startup
jarthana · May 29, 2014 · e0c2567 · e0c2567
1 parent 6e5c04e
commit e0c2567
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/....flight.core/src/org/eclipse/flux/core/internal/messaging/SocketIOMessagingConnector.java b/....flight.core/src/org/eclipse/flux/core/internal/messaging/SocketIOMessagingConnector.java
@@ -38,7 +38,8 @@ public boolean verify(String hostname, javax.net.ssl.SSLSession sslSession) {
 	private SocketIO socket;
 	private String host;
 
-	private boolean connectedToUserspace;
+	private transient boolean connectedToUserspace;
+	private transient boolean connected;
 
 	public SocketIOMessagingConnector(final String username) {
 		host = System.getProperty("flux-host", "http://localhost:3000");
@@ -71,6 +72,8 @@ public void onError(SocketIOException ex) {
 				@Override
 				public void onConnect() {
 					try {
+						connected = true;
+
 						JSONObject message = new JSONObject();
 						message.put("channel", username);
 
@@ -96,6 +99,7 @@ public void ack(Object... answer) {
 
 				@Override
 				public void onDisconnect() {
+					connected = false;
 					notifyDisconnected();
 				}
 
@@ -119,7 +123,7 @@ public void send(String messageType, JSONObject message) {
 
 	@Override
 	public boolean isConnected() {
-		return socket.isConnected() && connectedToUserspace;
+		return connected && connectedToUserspace;
 	}
 
 }