Merge pull request TooTallNate#610 from marci4/master

marci4 · web-flow · commit ca85bbfe6fab · 2017-11-18T14:35:31.000+01:00
Check if connection is open on sendPing &amp;  change readystate on closeConnection
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,6 @@ bin
 /doc
 *.xml
 .idea/.name
-*.jks
+*.jks
+lib/junit-4.7.jar
+*.jar
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,30 @@
+node {
+   def mvnHome
+   stage('Preparation') { // for display purposes
+      // Get some code from a GitHub repository
+      git 'https://github.com/marci4/Java-WebSocket-Dev.git'
+      // Get the Maven tool.
+      // ** NOTE: This 'M3' Maven tool must be configured
+      // **       in the global configuration.           
+      mvnHome = tool 'M3'
+   }
+   stage('Build') {
+      // Run the maven build
+      if (isUnix()) {
+         sh "'${mvnHome}/bin/mvn' -Dmaven.test.failure.ignore clean package"
+      } else {
+         bat(/"${mvnHome}\bin\mvn" -Dmaven.test.failure.ignore clean package/)
+      }
+   }
+   stage('Test') { 
+         if (isUnix()) {
+         sh "'${mvnHome}/bin/mvn' test package"
+      } else {
+         bat(/"${mvnHome}\bin\mvn" test package/)
+      }
+   }
+   stage('Results') {
+      junit '**/target/surefire-reports/TEST-*.xml'
+      archive 'target/*.jar'
+   }
+}
diff --git a/src/main/java/org/java_websocket/AbstractWebSocket.java b/src/main/java/org/java_websocket/AbstractWebSocket.java
@@ -139,7 +139,12 @@ public void run() {
 								System.out.println("Closing connection due to no pong received: " + conn.toString());
 							webSocketImpl.closeConnection( CloseFrame.ABNORMAL_CLOSE , false );
 						} else {
-							webSocketImpl.sendPing();
+							if (webSocketImpl.isOpen()) {
+								webSocketImpl.sendPing();
+							} else {
+								if (WebSocketImpl.DEBUG)
+									System.out.println("Trying to ping a non open connection: " + conn.toString());
+							}
 						}
 					}
 				}
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -201,8 +201,8 @@ public void decode( ByteBuffer socketBuffer ) {
 		if( DEBUG )
 			System.out.println( "process(" + socketBuffer.remaining() + "): {" + ( socketBuffer.remaining() > 1000 ? "too big to display" : new String( socketBuffer.array(), socketBuffer.position(), socketBuffer.remaining() ) ) + '}' );
 
-		if( getReadyState()  != READYSTATE.NOT_YET_CONNECTED ) {
-			if( getReadyState()  == READYSTATE.OPEN ) {
+		if( getReadyState() != READYSTATE.NOT_YET_CONNECTED ) {
+			if( getReadyState() == READYSTATE.OPEN ) {
 				decodeFrames( socketBuffer );
 			}
 		} else {
@@ -406,12 +406,12 @@ private ByteBuffer generateHttpResponseDueToError( int errorCode ) {
 		return ByteBuffer.wrap( Charsetfunctions.asciiBytes( "HTTP/1.1 " + errorCodeDescription + "\r\nContent-Type: text/html\nServer: TooTallNate Java-WebSocket\r\nContent-Length: " + ( 48 + errorCodeDescription.length() ) + "\r\n\r\n<html><head></head><body><h1>" + errorCodeDescription + "</h1></body></html>" ) );
 	}
 
-	public void close( int code, String message, boolean remote ) {
-		if( getReadyState()  != READYSTATE.CLOSING && readystate != READYSTATE.CLOSED ) {
-			if( getReadyState()  == READYSTATE.OPEN ) {
+	public synchronized void close( int code, String message, boolean remote ) {
+		if( getReadyState() != READYSTATE.CLOSING && readystate != READYSTATE.CLOSED ) {
+			if( getReadyState() == READYSTATE.OPEN ) {
 				if( code == CloseFrame.ABNORMAL_CLOSE ) {
 					assert ( !remote );
-					setReadyState(READYSTATE.CLOSING);
+					setReadyState( READYSTATE.CLOSING );
 					flushAndClose( code, message, false );
 					return;
 				}
@@ -424,7 +424,7 @@ public void close( int code, String message, boolean remote ) {
 								wsl.onWebsocketError( this, e );
 							}
 						}
-						if (isOpen()) {
+						if( isOpen() ) {
 							CloseFrame closeFrame = new CloseFrame();
 							closeFrame.setReason( message );
 							closeFrame.setCode( code );
@@ -445,7 +445,7 @@ public void close( int code, String message, boolean remote ) {
 			} else {
 				flushAndClose( CloseFrame.NEVER_CONNECTED, message, false );
 			}
-			setReadyState(READYSTATE.CLOSING);
+			setReadyState( READYSTATE.CLOSING );
 			tmpHandshakeBytes = null;
 			return;
 		}
@@ -471,7 +471,12 @@ public synchronized void closeConnection( int code, String message, boolean remo
 		if( getReadyState() == READYSTATE.CLOSED ) {
 			return;
 		}
-
+		//Methods like eot() call this method without calling onClose(). Due to that reason we have to adjust the readystate manually
+		if( getReadyState() == READYSTATE.OPEN ) {
+			if( code == CloseFrame.ABNORMAL_CLOSE ) {
+				setReadyState( READYSTATE.CLOSING );
+			}
+		}
 		if( key != null ) {
 			// key.attach( null ); //see issue #114
 			key.cancel();
@@ -497,8 +502,7 @@ public synchronized void closeConnection( int code, String message, boolean remo
 		if( draft != null )
 			draft.reset();
 		handshakerequest = null;
-
-		setReadyState(READYSTATE.CLOSED);
+		setReadyState( READYSTATE.CLOSED );
 	}
 
 	protected void closeConnection( int code, boolean remote ) {
@@ -597,7 +601,7 @@ private void send( Collection<Framedata> frames ) {
 		if( !isOpen() ) {
 			throw new WebsocketNotConnectedException();
 		}
-		if( frames == null) {
+		if( frames == null ) {
 			throw new IllegalArgumentException();
 		}
 		ArrayList<ByteBuffer> outgoingFrames = new ArrayList<ByteBuffer>();
@@ -691,7 +695,7 @@ private void write( List<ByteBuffer> bufs ) {
 	private void open( Handshakedata d ) {
 		if( DEBUG )
 			System.out.println( "open using draft: " + draft );
-		setReadyState(READYSTATE.OPEN);
+		setReadyState( READYSTATE.OPEN );
 		try {
 			wsl.onWebsocketOpen( this, d );
 		} catch ( RuntimeException e ) {

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,12 @@ public void run() {`
`139`	`139`	`System.out.println("Closing connection due to no pong received: " + conn.toString());`
`140`	`140`	`webSocketImpl.closeConnection( CloseFrame.ABNORMAL_CLOSE , false );`
`141`	`141`	`} else {`
`142`		`- webSocketImpl.sendPing();`
	`142`	`+ if (webSocketImpl.isOpen()) {`
	`143`	`+ webSocketImpl.sendPing();`
	`144`	`+ } else {`
	`145`	`+ if (WebSocketImpl.DEBUG)`
	`146`	`+ System.out.println("Trying to ping a non open connection: " + conn.toString());`
	`147`	`+ }`
`143`	`148`	`}`
`144`	`149`	`}`
`145`	`150`	`}`