updating WebSocketClient and WebSocketServer onClose & onIOError events to simulate browser WebSocket behaviour

Kristijan Sedlak · Kristijan Sedlak · commit 3dfc8359b48e · 2011-06-29T12:21:18.000+02:00
diff --git a/src/net/tootallnate/websocket/WebSocketClient.java b/src/net/tootallnate/websocket/WebSocketClient.java
@@ -14,6 +14,8 @@
 import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import android.util.Log;
+
 /**
  * The <tt>WebSocketClient</tt> is an abstract class that expects a valid
  * "ws://" URI to connect to. When connected, an instance recieves important
@@ -116,12 +118,16 @@ public void connect() {
    * closes the socket connection, and ends the client socket thread.
    * @throws IOException When socket related I/O errors occur.
    */
-  public void close() throws IOException {
-    if (running) {
-      this.running = false;
-      selector.wakeup();
-      conn.close();
-    }
+  public void close() throws IOException 
+  {    
+	  Boolean active = running;
+	  this.running = false;
+	  
+	  if (active)
+	  {
+		  selector.wakeup();
+		  conn.close();
+	  }
   }
 
   /**
@@ -344,17 +350,36 @@ public void onOpen(WebSocket conn) {
    * Calls subclass' implementation of <var>onClose</var>.
    * @param conn
    */
-  public void onClose(WebSocket conn) {
-    onClose();
+  public void onClose(WebSocket conn) 
+  {
+	  try 
+	  {
+		  close();
+	  } 
+	  catch (IOException ex) 
+	  {
+		  onIOError(ex);
+	  }
+	  onClose();
   }
 
   /**
    * Triggered on any IOException error. This method should be overridden for custom 
    * implementation of error handling (e.g. when network is not available). 
    * @param ex
    */
-   public void onIOError(IOException ex) {
+   public void onIOError(IOException ex) 
+   {
  	  ex.printStackTrace();
+ 	  
+ 	  try 
+ 	  {
+		this.close();
+ 	  } 
+ 	  catch (IOException e) 
+ 	  {
+		onIOError(ex);
+ 	  }
    }
 
   // ABTRACT METHODS /////////////////////////////////////////////////////////
diff --git a/src/net/tootallnate/websocket/WebSocketServer.java b/src/net/tootallnate/websocket/WebSocketServer.java
@@ -420,9 +420,19 @@ public void onClose(WebSocket conn) {
    * implementation of error handling (e.g. when network is not available). 
    * @param ex
    */
-   public void onIOError(IOException ex) {
- 	  ex.printStackTrace();
-   }
+  public void onIOError(IOException ex) 
+  {
+	  ex.printStackTrace();
+	  
+	  try 
+	  {
+		this.stop();
+	  } 
+	  catch (IOException e) 
+	  {
+		onIOError(ex);
+	  }
+  }
 
   private byte[] getPart(String key) {
     long keyNumber = Long.parseLong(key.replaceAll("[^0-9]",""));
