-fixed infinite recurring on lost connections

Davidiusdadi · Davidiusdadi · commit 0298adea7c39 · 2011-11-20T02:14:51.000+01:00
diff --git a/src/net/tootallnate/websocket/WebSocketServer.java b/src/net/tootallnate/websocket/WebSocketServer.java
@@ -6,18 +6,13 @@
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import sun.misc.BASE64Encoder;
-
 /**
  * <tt>WebSocketServer</tt> is an abstract class that only takes care of the
  * HTTP handshake portion of WebSockets. It's up to a subclass to add
@@ -205,13 +200,14 @@ public void run() {
     }
 
     while(true) {
+      SelectionKey key = null;
       try {
         selector.select();
         Set<SelectionKey> keys = selector.selectedKeys();
         Iterator<SelectionKey> i = keys.iterator();
 
         while(i.hasNext()) {
-          SelectionKey key = i.next();
+          key = i.next();
 
           // Remove the current key
           i.remove();
@@ -254,6 +250,8 @@ public void run() {
           }
         }
       } catch (IOException ex) {
+    	  if( key != null )
+    		  key.cancel();
     	  onError(ex);
       } catch (RuntimeException ex) {
         ex.printStackTrace();
