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

Davidiusdadi · Davidiusdadi · commit de9955afa8e6 · 2013-09-04T23:21:40.000+02:00
underlying socket
diff --git a/src/main/java/org/java_websocket/SocketChannelIOHelper.java b/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();
 			}
-		}
+		}*/
 		return c != null ? !( (WrappedByteChannel) sockchannel ).isNeedWrite() : true;
 	}
 
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -149,15 +149,11 @@ public WebSocketImpl( WebSocketListener listener , List<Draft> drafts , Socket s
 	public void decode( ByteBuffer socketBuffer ) {
 		assert ( socketBuffer.hasRemaining() );
 
-		if( flushandclosestate ) {
-			return;
-		}
-
 		if( DEBUG )
 			System.out.println( "process(" + socketBuffer.remaining() + "): {" + ( socketBuffer.remaining() > 1000 ? "too big to display" : new String( 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 ) {
 	}
 
 	private void decodeFrames( ByteBuffer socketBuffer ) {
-		if( flushandclosestate )
-			return;
 
 		List<Framedata> frames;
 		try {
 			frames = draft.translateFrame( socketBuffer );
 			for( Framedata f : frames ) {
 				if( DEBUG )
 					System.out.println( "matched frame: " + f );
-				if( flushandclosestate )
-					return;
 				Opcode curop = f.getOpcode();
 				boolean fin = f.isFin();
 

Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,11 @@ public static boolean batch( WebSocketImpl ws, ByteChannel sockchannel ) throws`
`59`	`59`	`} while ( buffer != null );`
`60`	`60`	`}`
`61`	`61`
`62`		`- if( ws.outQueue.isEmpty() && ws.isFlushAndClose() /&& ( c == null \|\| c.isNeedWrite() )/) {`
	`62`	`+ /*if( ws.outQueue.isEmpty() && ws.isFlushAndClose() ) {//`
`63`	`63`	`synchronized ( ws ) {`
`64`	`64`	`ws.closeConnection();`
`65`	`65`	`}`
`66`		`- }`
	`66`	`+ }*/`
`67`	`67`	`return c != null ? !( (WrappedByteChannel) sockchannel ).isNeedWrite() : true;`
`68`	`68`	`}`
`69`	`69`