onError won't be called with IOExceptions any more! In the past a user were bothered with IOExceptions even though the connections were closed properly which is confusing! Whether a connection was closed cleanly is be reported by onClose. Additionally i changed WebSocketImpl::eot and reformatted code

Davidiusdadi · Davidiusdadi · commit 44dee6c2273f · 2012-10-27T19:32:03.000+02:00
diff --git a/src/main/java/org/java_websocket/SocketChannelIOHelper.java b/src/main/java/org/java_websocket/SocketChannelIOHelper.java
@@ -12,7 +12,7 @@ public static boolean read( final ByteBuffer buf, WebSocketImpl ws, ByteChannel
 		buf.flip();
 
 		if( read == -1 ) {
-			ws.eot( null );
+			ws.eot();
 			return false;
 		}
 		return read != 0;
@@ -24,7 +24,7 @@ public static boolean readMore( final ByteBuffer buf, WebSocketImpl ws, WrappedB
 		buf.flip();
 
 		if( read == -1 ) {
-			ws.eot( null );
+			ws.eot();
 			return false;
 		}
 		return channel.isNeedRead();
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -68,7 +68,6 @@ public class WebSocketImpl extends WebSocket {
 	 **/
 	public volatile WebSocketWorker workerThread; // TODO reset worker?
 
-
 	/**
 	 * Determines whether to receive data as part of the
 	 * handshake, or as part of text/data frame transmitted over the websocket.
@@ -83,7 +82,6 @@ public class WebSocketImpl extends WebSocket {
 	 */
 	private volatile boolean connectionClosed = false;
 
-
 	/**
 	 * The listener to notify of WebSocket events.
 	 */
@@ -421,22 +419,18 @@ protected void closeConnection( int code, boolean remote ) {
 		closeConnection( code, "", remote );
 	}
 
-	public void eot( Exception e ) {
-		if( e == null || e instanceof IOException ) {
-			if( draft == null ) {
+	public void eot() {
+		if( draft == null ) {
+			closeConnection( CloseFrame.ABNORMAL_CLOSE, true );
+		} else if( draft.getCloseHandshakeType() == CloseHandshakeType.NONE ) {
+			closeConnection( CloseFrame.NORMAL, true );
+		} else if( draft.getCloseHandshakeType() == CloseHandshakeType.ONEWAY ) {
+			if( role == Role.SERVER )
 				closeConnection( CloseFrame.ABNORMAL_CLOSE, true );
-			} else if( draft.getCloseHandshakeType() == CloseHandshakeType.NONE ) {
+			else
 				closeConnection( CloseFrame.NORMAL, true );
-			} else if( draft.getCloseHandshakeType() == CloseHandshakeType.ONEWAY ) {
-				if( role == Role.SERVER )
-					closeConnection( CloseFrame.ABNORMAL_CLOSE, true );
-				else
-					closeConnection( CloseFrame.NORMAL, true );
-			} else {
-				closeConnection( CloseFrame.ABNORMAL_CLOSE, true );
-			}
 		} else {
-			closeConnection( CloseFrame.BUGGYCLOSE, e.toString(), false );
+			closeConnection( CloseFrame.ABNORMAL_CLOSE, true );
 		}
 	}
 
@@ -542,7 +536,7 @@ public void startHandshake( ClientHandshakeBuilder handshakedata ) throws Invali
 	private void write( ByteBuffer buf ) {
 		if( DEBUG )
 			System.out.println( "write(" + buf.remaining() + "): {" + ( buf.remaining() > 1000 ? "too big to display" : new String( buf.array() ) ) + "}" );
-		
+
 		outQueue.add( buf );
 		/*try {
 			outQueue.put( buf );
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -188,7 +188,7 @@ public void run() {
 		if( thread == null )
 			thread = Thread.currentThread();
 		interruptableRun();
-		
+
 		assert ( !channel.isOpen() );
 
 		try {
@@ -228,6 +228,7 @@ private final void interruptableRun() {
 					key = i.next();
 					i.remove();
 					if( !key.isValid() ) {
+						conn.eot();
 						continue;
 					}
 					if( key.isReadable() && SocketChannelIOHelper.read( buff, this.conn, wrappedchannel ) ) {
@@ -260,13 +261,14 @@ private final void interruptableRun() {
 			}
 
 		} catch ( CancelledKeyException e ) {
+			conn.eot();
 		} catch ( IOException e ) {
-			onError( e );
-			conn.close( CloseFrame.ABNORMAL_CLOSE );
+			// onError( e );
+			conn.eot();
 		} catch ( RuntimeException e ) {
 			// this catch case covers internal errors only and indicates a bug in this websocket implementation
 			onError( e );
-			conn.eot( e );
+			conn.close( CloseFrame.ABNORMAL_CLOSE );
 		}
 	}
 
@@ -276,11 +278,9 @@ private int getPort() {
 			String scheme = uri.getScheme();
 			if( scheme.equals( "wss" ) ) {
 				return WebSocket.DEFAULT_WSS_PORT;
-			}
-			else if( scheme.equals( "ws" ) ) {
+			} else if( scheme.equals( "ws" ) ) {
 				return WebSocket.DEFAULT_PORT;
-			}
-			else{
+			} else {
 				throw new RuntimeException( "unkonow scheme" + scheme );
 			}
 		}
@@ -413,5 +413,3 @@ public interface WebSocketClientFactory extends WebSocketFactory {
 		public ByteChannel wrapChannel( SelectionKey key, String host, int port ) throws IOException;
 	}
 }
-
-
