made the close code for connections that never completed the initial handshake CloseFrame.NEVER_CONNECTED instead of CloseFrame.ABNORMAL_CLOSE and renamed NOTYETCONNECTED to NOT_YET_CONNECTED and CloseFrame.NEVERCONNECTED to CloseFrame.NEVER_CONNECTED

Author: Davidiusdadi

src/main/java/org/java_websocket/WebSocket.java

@@ -15,7 +15,7 @@ public enum Role{
  }
 
 publicenumREADYSTATE{
-NOTYETCONNECTED, CONNECTING, OPEN, CLOSING, CLOSED;
+NOT_YET_CONNECTED, CONNECTING, OPEN, CLOSING, CLOSED;
  }
 
 publicstaticintRCVBUF = 16384;

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

@@ -75,7 +75,7 @@ public class WebSocketImpl extends WebSocket{
 /** When true no further frames may be submitted to be sent */
 privatevolatilebooleanflushandclosestate = false;
 
-privateREADYSTATEreadystate = READYSTATE.NOTYETCONNECTED;
+privateREADYSTATEreadystate = READYSTATE.NOT_YET_CONNECTED;
 
 /**
  * The listener to notify of WebSocket events.
@@ -203,7 +203,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ){
 returnfalse;
  } catch ( RuntimeExceptione ){
 wsl.onWebsocketError( this, e );
-flushAndClose( CloseFrame.NEVERCONNECTED, e.getMessage(), false );
+flushAndClose( CloseFrame.NEVER_CONNECTED, e.getMessage(), false );
 returnfalse;
  }
 write( d.createHandshake( d.postProcessHandshakeResponseAsServer( handshake, response ), role ) );
@@ -254,7 +254,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ){
 returnfalse;
  } catch ( RuntimeExceptione ){
 wsl.onWebsocketError( this, e );
-flushAndClose( CloseFrame.NEVERCONNECTED, e.getMessage(), false );
+flushAndClose( CloseFrame.NEVER_CONNECTED, e.getMessage(), false );
 returnfalse;
  }
 open( handshake );
@@ -399,7 +399,7 @@ private void close( int code, String message, boolean remote ){
 assert ( remote );
 flushAndClose( CloseFrame.FLASHPOLICY, message, true );
  } else{
-flushAndClose( CloseFrame.NEVERCONNECTED, message, false );
+flushAndClose( CloseFrame.NEVER_CONNECTED, message, false );
  }
 if( code == CloseFrame.PROTOCOL_ERROR )// this endpoint found a PROTOCOL_ERROR
 flushAndClose( code, message, remote );
@@ -487,6 +487,9 @@ protected synchronized void flushAndClose( int code, String message, boolean rem
  }
 
 publicvoideot(){
+if( getReadyState() == READYSTATE.NOT_YET_CONNECTED ){
+closeConnection( CloseFrame.NEVER_CONNECTED, true );
+ }
 if( draft == null ){
 closeConnection( CloseFrame.ABNORMAL_CLOSE, true );
  } elseif( draft.getCloseHandshakeType() == CloseHandshakeType.NONE ){

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

@@ -234,7 +234,7 @@ private final void interruptableRun(){
 selector.select( timeout );
 Set<SelectionKey> keys = selector.selectedKeys();
 Iterator<SelectionKey> i = keys.iterator();
-if( conn.getReadyState() == READYSTATE.NOTYETCONNECTED && !i.hasNext() ){
+if( conn.getReadyState() == READYSTATE.NOT_YET_CONNECTED && !i.hasNext() ){
 // Hack for issue #140:
 // Android does simply return form select without closing the channel if address is not reachable(which seems to be a bug in the android nio proivder)
 // TODO provide a way to fix this problem which does not require this hack
@@ -343,7 +343,7 @@ private void sendHandshake() throws InvalidHandshakeException{
  */
 publicREADYSTATEgetReadyState(){
 if( conn == null ){
-returnREADYSTATE.NOTYETCONNECTED;
+returnREADYSTATE.NOT_YET_CONNECTED;
  }
 returnconn.getReadyState();
  }

src/main/java/org/java_websocket/framing/CloseFrame.java

@@ -89,7 +89,7 @@ public interface CloseFrame extends Framedata{
 publicstaticfinalintTLS_ERROR = 1015;
 
 /** The connection had never been established */
-publicstaticfinalintNEVERCONNECTED = -1;
+publicstaticfinalintNEVER_CONNECTED = -1;
 publicstaticfinalintBUGGYCLOSE = -2;
 publicstaticfinalintFLASHPOLICY = -3;