-made close frames require a close frame in response before closing the

underlying socket

Author: Davidiusdadi

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

@@ -59,11 +59,11 @@ public static boolean batch( WebSocketImpl ws, ByteChannel sockchannel ) throws
  } while ( buffer != null );
  }
 
-if( ws.outQueue.isEmpty() && ws.isFlushAndClose() /*&& ( c == null || c.isNeedWrite() )*/){
+/*if( ws.outQueue.isEmpty() && ws.isFlushAndClose() ){//
  synchronized ( ws ){
  ws.closeConnection();
  }
- }
+ }*/
 returnc != null ? !( (WrappedByteChannel) sockchannel ).isNeedWrite() : true;
  }
 

src/main/java/org/java_websocket/WebSocketImpl.java

@@ -149,15 +149,11 @@ public WebSocketImpl( WebSocketListener listener , List<Draft> drafts , Socket s
 publicvoiddecode( ByteBuffersocketBuffer ){
 assert ( socketBuffer.hasRemaining() );
 
-if( flushandclosestate ){
-return;
- }
-
 if( DEBUG )
 System.out.println( "process(" + socketBuffer.remaining() + "):{" + ( socketBuffer.remaining() > 1000 ? "too big to display" : newString( socketBuffer.array(), socketBuffer.position(), socketBuffer.remaining() ) ) + "}" );
 
-if( readystate==READYSTATE.OPEN ){
-decodeFrames( socketBuffer );
+if( readystate!=READYSTATE.NOT_YET_CONNECTED ){
+decodeFrames( socketBuffer );;
  } else{
 if( decodeHandshake( socketBuffer ) ){
 assert ( tmpHandshakeBytes.hasRemaining() != socketBuffer.hasRemaining() || !socketBuffer.hasRemaining() ); // the buffers will never have remaining bytes at the same time
@@ -312,17 +308,13 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ){
  }
 
 privatevoiddecodeFrames( ByteBuffersocketBuffer ){
-if( flushandclosestate )
-return;
 
 List<Framedata> frames;
 try{
 frames = draft.translateFrame( socketBuffer );
 for( Framedataf : frames ){
 if( DEBUG )
 System.out.println( "matched frame: " + f );
-if( flushandclosestate )
-return;
 Opcodecurop = f.getOpcode();
 booleanfin = f.isFin();