close socket connection issue fix (connection do not close when manually calling close())

Kristijan Sedlak · Kristijan Sedlak · commit 877314d4512b · 2011-07-03T17:30:57.000+02:00
diff --git a/src/net/tootallnate/websocket/WebSocketClient.java b/src/net/tootallnate/websocket/WebSocketClient.java
@@ -120,8 +120,9 @@ public void close() throws IOException
   {    
 	  if (running)
 	  {
+		  running = false;  // must be called to stop do loop
 		  selector.wakeup();
-		  conn.close();
+		  conn.close();		// synchronously calling onClose(conn)
 	  }
   }
 
@@ -364,11 +365,7 @@ public void onOpen(WebSocket conn) {
    */
   public void onClose(WebSocket conn) 
   {
-	  if (running)
-	  {
-		  onClose();
-	  }
-	  
+	  onClose();
 	  releaseAndInitialize();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,9 @@ public void close() throws IOException`
`120`	`120`	`{`
`121`	`121`	`if (running)`
`122`	`122`	`{`
	`123`	`+ running = false; // must be called to stop do loop`
`123`	`124`	`selector.wakeup();`
`124`		`- conn.close();`
	`125`	`+ conn.close(); // synchronously calling onClose(conn)`
`125`	`126`	`}`
`126`	`127`	`}`
`127`	`128`
`@@ -364,11 +365,7 @@ public void onOpen(WebSocket conn) {`
`364`	`365`	`*/`
`365`	`366`	`public void onClose(WebSocket conn)`
`366`	`367`	`{`
`367`		`- if (running)`
`368`		`- {`
`369`		`- onClose();`
`370`		`- }`
`371`		`-`
	`368`	`+ onClose();`
`372`	`369`	`releaseAndInitialize();`
`373`	`370`	`}`
`374`	`371`