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 @@
 importjava.nio.channels.ByteChannel;
 importjava.nio.channels.spi.AbstractSelectableChannel;
 
+importorg.java_websocket.WebSocket.Role;
+
 publicclassSocketChannelIOHelper{
 
 publicstaticbooleanread( finalByteBufferbuf, WebSocketImplws, ByteChannelchannel ) throwsIOException{
@@ -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();
  }
- }*/
+ }
 returnc != null ? !( (WrappedByteChannel) sockchannel ).isNeedWrite() : true;
  }
-
-publicstaticvoidwriteBlocking( WebSocketImplws, ByteChannelchannel ) throwsInterruptedException , IOException{
-assert ( channelinstanceofAbstractSelectableChannel == true ? ( (AbstractSelectableChannel) channel ).isBlocking() : true );
-assert ( channelinstanceofWrappedByteChannel == true ? ( (WrappedByteChannel) channel ).isBlocking() : true );
-
-ByteBufferbuf = 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(){
 intreadBytes;
 
 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 ( IOExceptione ){
+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
 publicvoidsetParseMode( Rolerole ){
 this.role = role;
  }
+
+publicRolegetRole(){
+returnrole;
+ }
 
 }