Merge pull request TooTallNate#455 from marci4/master

marci4 · web-flow · commit 543bd90b7b9b · 2017-04-15T23:08:48.000+02:00
Added callback for successfull start of server
Switched around call for connect/closing latches
diff --git a/src/main/example/ChatServer.java b/src/main/example/ChatServer.java
@@ -76,6 +76,11 @@ public void onError( WebSocket conn, Exception ex ) {
 		}
 	}
 
+	@Override
+	public void onStart() {
+		System.out.println("Server started!");
+	}
+
 	/**
 	 * Sends <var>text</var> to all currently connected WebSocket clients.
 	 * 
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -271,17 +271,15 @@ public void onWebsocketMessageFragment( WebSocket conn, Framedata frame ) {
 	 */
 	@Override
 	public final void onWebsocketOpen( WebSocket conn, Handshakedata handshake ) {
-		connectLatch.countDown();
 		onOpen( (ServerHandshake) handshake );
+		connectLatch.countDown();
 	}
 
 	/**
 	 * Calls subclass' implementation of <var>onClose</var>.
 	 */
 	@Override
 	public final void onWebsocketClose( WebSocket conn, int code, String reason, boolean remote ) {
-		connectLatch.countDown();
-		closeLatch.countDown();
 		if( writeThread != null )
 			writeThread.interrupt();
 		try {
@@ -291,6 +289,8 @@ public final void onWebsocketClose( WebSocket conn, int code, String reason, boo
 			onWebsocketError( this, e );
 		}
 		onClose( code, reason, remote );
+		connectLatch.countDown();
+		closeLatch.countDown();
 	}
 
 	/**
diff --git a/src/main/java/org/java_websocket/drafts/Draft_10.java b/src/main/java/org/java_websocket/drafts/Draft_10.java
@@ -53,7 +53,6 @@ public static int readVersion(Handshakedata handshakedata) {
     }
 
     private ByteBuffer incompleteframe;
-    private Framedata fragmentedframe = null;
 
     private final Random reuseableRandom = new Random();
 
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -280,6 +280,7 @@ public void run() {
 			socket.bind( address );
 			selector = Selector.open();
 			server.register( selector, server.validOps() );
+			onStart();
 		} catch ( IOException ex ) {
 			handleFatal( null, ex );
 			return;
@@ -684,6 +685,14 @@ public InetSocketAddress getRemoteSocketAddress( WebSocket conn ) {
 	 *            Can be null if there error does not belong to one specific websocket. For example if the servers port could not be bound.
 	 **/
 	public abstract void onError( WebSocket conn, Exception ex );
+
+	/**
+	 * Called when the server started up successfully.
+	 *
+	 * If any error occured, onError is called instead.
+	 */
+	public abstract void onStart();
+
 	/**
 	 * Callback for binary messages received from the remote host
 	 * 
diff --git a/src/test/java/org/java_websocket/AutobahnClientScenario.java b/src/test/java/org/java_websocket/AutobahnClientScenario.java
@@ -50,6 +50,11 @@ public void onError(WebSocket conn, Exception ex) {
 			//throw new UnsupportedOperationException("Not supported yet.");
 		}
 
+		@Override
+		public void onStart() {
+
+		}
+
 	}
 
 	private class AutobahnClient extends WebSocketClient {
diff --git a/src/test/java/org/java_websocket/example/AutobahnServerTest.java b/src/test/java/org/java_websocket/example/AutobahnServerTest.java
@@ -42,6 +42,11 @@ public void onError( WebSocket conn, Exception ex ) {
 		ex.printStackTrace();
 	}
 
+	@Override
+	public void onStart() {
+		System.out.println( "Server started!" );
+	}
+
 	@Override
 	public void onMessage( WebSocket conn, String message ) {
 		conn.send( message );

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,11 @@ public void onError( WebSocket conn, Exception ex ) {`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
	`79`	`+ @Override`
	`80`	`+ public void onStart() {`
	`81`	`+ System.out.println("Server started!");`
	`82`	`+ }`
	`83`	`+`
`79`	`84`	`/**`
`80`	`85`	`* Sends <var>text</var> to all currently connected WebSocket clients.`
`81`	`86`	`*`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ public static int readVersion(Handshakedata handshakedata) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private ByteBuffer incompleteframe;`
`56`		`- private Framedata fragmentedframe = null;`
`57`	`56`
`58`	`57`	`private final Random reuseableRandom = new Random();`
`59`	`58`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,11 @@ public void onError(WebSocket conn, Exception ex) {`
`50`	`50`	`//throw new UnsupportedOperationException("Not supported yet.");`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ @Override`
	`54`	`+ public void onStart() {`
	`55`	`+`
	`56`	`+ }`
	`57`	`+`
`53`	`58`	`}`
`54`	`59`
`55`	`60`	`private class AutobahnClient extends WebSocketClient {`