fixed websocket client socket not being closed in some cases and server

waiting for clients to close connection first

Author: Davidiusdadi

src/main/java/org/java_websocket/SocketChannelIOHelper.java

@@ -5,6 +5,8 @@
 import java.nio.channels.ByteChannel;
 import java.nio.channels.spi.AbstractSelectableChannel;
 
+import org.java_websocket.WebSocket.Role;
+
 public class SocketChannelIOHelper {
 
 	public static boolean read( final ByteBuffer buf, WebSocketImpl ws, ByteChannel channel ) throws IOException {
@@ -59,21 +61,11 @@ public static boolean batch( WebSocketImpl ws, ByteChannel sockchannel ) throws
 			} while ( buffer != null );
 		}
 
-		/*if( ws.outQueue.isEmpty() && ws.isFlushAndClose() ) {//
+		if( ws.outQueue.isEmpty() && ws.isFlushAndClose() && ws.getDraft().getRole() == Role.SERVER ) {//
 			synchronized ( ws ) {
 				ws.closeConnection();
 			}
-		}*/
+		}
 		return c != null ? !( (WrappedByteChannel) sockchannel ).isNeedWrite() : true;
 	}
-
-	public static void writeBlocking( WebSocketImpl ws, ByteChannel channel ) throws InterruptedException , IOException {
-		assert ( channel instanceof AbstractSelectableChannel == true ? ( (AbstractSelectableChannel) channel ).isBlocking() : true );
-		assert ( channel instanceof WrappedByteChannel == true ? ( (WrappedByteChannel) channel ).isBlocking() : true );
-
-		ByteBuffer buf = ws.outQueue.take();
-		while ( buf.hasRemaining() )
-			channel.write( buf );
-	}
-
 }

src/main/java/org/java_websocket/client/WebSocketClient.java

@@ -181,7 +181,7 @@ public void run() {
 		int readBytes;
 
 		try {
-			while ( ( readBytes = istream.read( rawbuffer ) ) != -1 ) {
+			while ( !isClosed() && ( readBytes = istream.read( rawbuffer ) ) != -1 ) {
 				engine.decode( ByteBuffer.wrap( rawbuffer, 0, readBytes ) );
 			}
 			engine.eot();
@@ -276,6 +276,12 @@ public final void onWebsocketClose( WebSocket conn, int code, String reason, boo
 		closeLatch.countDown();
 		if( writeThread != null )
 			writeThread.interrupt();
+		try {
+			if( socket != null )
+				socket.close();
+		} catch ( IOException e ) {
+			onWebsocketError( this, e );
+		}
 		onClose( code, reason, remote );
 	}
 

src/main/java/org/java_websocket/drafts/Draft.java

@@ -220,5 +220,9 @@ public int checkAlloc( int bytecount ) throws LimitExedeedException , InvalidDat
 	public void setParseMode( Role role ) {
 		this.role = role;
 	}
+	
+	public Role getRole() {
+		return role;
+	}
 
 }