Make WebSocketClient#close actually end the underlying Thread and socket connection. Closes TooTallNate#5.

TooTallNate · TooTallNate · commit e5e21941b8a3 · 2010-10-08T09:05:50.000-07:00
diff --git a/dist/WebSocket.jar b/dist/WebSocket.jar
diff --git a/example/ChatClient.java b/example/ChatClient.java
@@ -43,6 +43,7 @@ public void onClose() {
     private static class Frame extends JFrame implements ActionListener {
         private final JTextField uriField;
         private final JButton connect;
+        private final JButton close;
         private final JTextArea area;
         private final JTextField chatField;
         private ChatClient cc;
@@ -52,7 +53,7 @@ public Frame() {
             Container c = getContentPane();
             GridLayout layout = new GridLayout();
             layout.setColumns(1);
-            layout.setRows(4);
+            layout.setRows(5);
             c.setLayout(layout);
 
             uriField = new JTextField();
@@ -62,6 +63,10 @@ public Frame() {
             connect = new JButton("Connect");
             connect.addActionListener(this);
             c.add(connect);
+            
+            close = new JButton("Close");
+            close.addActionListener(this);
+            c.add(close);
 
             JScrollPane scroll = new JScrollPane();
             area = new JTextArea();
@@ -116,6 +121,12 @@ public void actionPerformed(ActionEvent e) {
                     connect.setEnabled(true);
                     uriField.setEditable(true);
                 }
+            } else if (e.getSource() == close) {
+                try {
+                    cc.close();
+                } catch(Exception ex) {
+                  ex.printStackTrace();
+                }
             }
         }
     }
diff --git a/src/net/tootallnate/websocket/WebSocketClient.java b/src/net/tootallnate/websocket/WebSocketClient.java
@@ -46,26 +46,26 @@ public abstract class WebSocketClient implements Runnable, WebSocketListener {
    * The 'Selector' used to get event keys from the underlying socket.
    */
   private Selector selector;
+  /**
+   * Keeps track of whether or not the client thread should continue running.
+   */
+  private boolean running;
   /**
    * The Websocket mode this client is in.
    */
   private Draft draft;
   /**
    * Number 1 used in handshake 
    */
-  private int number1=0;
+  private int number1 = 0;
   /**
    * Number 2 used in handshake
    */
-  private int number2=0;
+  private int number2 = 0;
   /**
    * Key3 used in handshake
    */
-  private byte[] key3=null;
-  public static enum Draft{
-    DRAFT75,
-    DRAFT76
-  }
+  private byte[] key3 = null;
 
   // CONSTRUCTOR /////////////////////////////////////////////////////////////
   /**
@@ -87,13 +87,19 @@ public WebSocketClient(URI serverUri,Draft draft) {
   public URI getURI() {
     return uri;
   }
+  
+  @Override
+  public Draft getDraft() {
+    return this.draft;
+  }
 
   /**
    * Starts a background thread that attempts and maintains a WebSocket
    * connection to the URI specified in the constructor or via <var>setURI</var>.
    * <var>setURI</var>.
    */
   public void connect() {
+    this.running = true;
     (new Thread(this)).start();
   }
 
@@ -103,6 +109,8 @@ public void connect() {
    * @throws IOException When socket related I/O errors occur.
    */
   public void close() throws IOException {
+    this.running = false;
+    selector.wakeup();
     conn.close();
   }
 
@@ -141,7 +149,7 @@ public void run() {
     }
 
     // Continuous loop that is only supposed to end when "close" is called.
-    while (true) {
+    while (this.running) {
       try {
         selector.select();
         Set<SelectionKey> keys = selector.selectedKeys();
@@ -197,7 +205,7 @@ public void run() {
       }
     }
     
-    //System.err.println("WebSocketClient thread ended!");
+    System.err.println("WebSocketClient thread ended!");
   }
 
   private String generateKey() {
@@ -306,11 +314,6 @@ public void onOpen(WebSocket conn) {
   public void onClose(WebSocket conn) {
     onClose();
   }
-  
-  @Override
-  public net.tootallnate.websocket.WebSocketListener.Draft getDraft() {
-    return (net.tootallnate.websocket.WebSocketListener.Draft)net.tootallnate.websocket.WebSocketListener.Draft.valueOf(this.draft.name());
-  }
 
   // ABTRACT METHODS /////////////////////////////////////////////////////////
   public abstract void onMessage(String message);
diff --git a/src/net/tootallnate/websocket/WebSocketServer.java b/src/net/tootallnate/websocket/WebSocketServer.java
@@ -166,11 +166,11 @@ public void setPort(int port) {
    * @return The port number.
    */
   public int getPort() {
-    return port;
+    return this.port;
   }
 
   public Draft getDraft() {
-    return draft;
+    return this.draft;
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -166,11 +166,11 @@ public void setPort(int port) {`
`166`	`166`	`* @return The port number.`
`167`	`167`	`*/`
`168`	`168`	`public int getPort() {`
`169`		`- return port;`
	`169`	`+ return this.port;`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`public Draft getDraft() {`
`173`		`- return draft;`
	`173`	`+ return this.draft;`
`174`	`174`	`}`
`175`	`175`
`176`	`176`