Merge pull request TooTallNate#567 from felippeduran/fix_protocol_error

marci4 · web-flow · commit 1bc60f74b609 · 2017-10-12T18:30:44.000+02:00
Fix duplicate call of flushAndClose() if status code is PROTOCOL_ERROR on close() method.
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -447,11 +447,11 @@ public void close( int code, String message, boolean remote ) {
 			} else if( code == CloseFrame.FLASHPOLICY ) {
 				assert ( remote );
 				flushAndClose( CloseFrame.FLASHPOLICY, message, true );
+			} else if( code == CloseFrame.PROTOCOL_ERROR ) { // this endpoint found a PROTOCOL_ERROR
+				flushAndClose( code, message, remote );
 			} else {
 				flushAndClose( CloseFrame.NEVER_CONNECTED, message, false );
 			}
-			if( code == CloseFrame.PROTOCOL_ERROR )// this endpoint found a PROTOCOL_ERROR
-				flushAndClose( code, message, remote );
 			readystate = READYSTATE.CLOSING;
 			tmpHandshakeBytes = null;
 			return;
