fixed suppressed close frame on the client side & minor changes

Davidiusdadi · Davidiusdadi · commit 2ef1559bb15a · 2012-10-28T02:23:43.000+02:00
diff --git a/src/main/java/org/java_websocket/SocketChannelIOHelper.java b/src/main/java/org/java_websocket/SocketChannelIOHelper.java
@@ -39,9 +39,7 @@ public static boolean batch( WebSocketImpl ws, ByteChannel sockchannel ) throws
 				WrappedByteChannel c = (WrappedByteChannel) sockchannel;
 				if( c.isNeedWrite() ) {
 					c.writeMore();
-					return !c.isNeedWrite();
 				}
-				return true;
 			}
 		} else {
 			do {// FIXME writing as much as possible is unfair!!
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -398,16 +398,17 @@ protected synchronized void closeConnection( int code, String message, boolean r
 		}
 		connectionClosed = true;
 
-		if( key != null ) {
+		/*if( key != null ) {
 			// key.attach( null ); //see issue #114
 			key.cancel();
 			try {
 				channel.close();
 			} catch ( IOException e ) {
 				wsl.onWebsocketError( this, e );
 			}
-		}
-		// sockchannel.close();
+		}*/
+		wsl.onWriteDemand( this ); // ensures that all outgoing frames are flushed before closing the connection
+
 		this.wsl.onWebsocketClose( this, code, message, remote );
 		if( draft != null )
 			draft.reset();
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -58,6 +58,8 @@ public abstract class WebSocketClient extends WebSocketAdapter implements Runnab
 	private SocketChannel channel = null;
 
 	private ByteChannel wrappedchannel = null;
+
+	private SelectionKey key = null;
 	/**
 	 * The 'Selector' used to get event keys from the underlying socket.
 	 */
@@ -180,7 +182,7 @@ private void tryToConnect( InetSocketAddress remote ) throws IOException {
 		channel.configureBlocking( false );
 		channel.connect( remote );
 		selector = Selector.open();
-		channel.register( selector, SelectionKey.OP_CONNECT );
+		key = channel.register( selector, SelectionKey.OP_CONNECT );
 	}
 
 	// Runnable IMPLEMENTATION /////////////////////////////////////////////////
@@ -369,7 +371,6 @@ public final void onWebsocketOpen( WebSocket conn, Handshakedata handshake ) {
 	 */
 	@Override
 	public final void onWebsocketClose( WebSocket conn, int code, String reason, boolean remote ) {
-		thread.interrupt();
 		onClose( code, reason, remote );
 	}
 
@@ -385,7 +386,7 @@ public final void onWebsocketError( WebSocket conn, Exception ex ) {
 
 	@Override
 	public final void onWriteDemand( WebSocket conn ) {
-		channel.keyFor( selector ).interestOps( SelectionKey.OP_READ | SelectionKey.OP_WRITE );
+		key.interestOps( SelectionKey.OP_READ | SelectionKey.OP_WRITE );
 		selector.wakeup();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,7 @@ public static boolean batch( WebSocketImpl ws, ByteChannel sockchannel ) throws`
`39`	`39`	`WrappedByteChannel c = (WrappedByteChannel) sockchannel;`
`40`	`40`	`if( c.isNeedWrite() ) {`
`41`	`41`	`c.writeMore();`
`42`		`- return !c.isNeedWrite();`
`43`	`42`	`}`
`44`		`- return true;`
`45`	`43`	`}`
`46`	`44`	`} else {`
`47`	`45`	`do {// FIXME writing as much as possible is unfair!!`