Merge pull request TooTallNate#856 from marci4/Issue855

Move the startup of the WebSocketWorker inside of run()

Author: marci4

src/main/java/org/java_websocket/server/WebSocketServer.java

@@ -228,10 +228,6 @@ public void start(){
 if( selectorthread != null )
 thrownewIllegalStateException( getClass().getName() + " can only be started once." );
 newThread( this ).start();
-
-for( WebSocketWorkerex : decoders ){
-ex.start();
- }
  }
 
 /**
@@ -510,6 +506,9 @@ private boolean doSetupSelectorAndServerThread(){
 selector = Selector.open();
 server.register( selector, server.validOps() );
 startConnectionLostTimer();
+for( WebSocketWorkerex : decoders ){
+ex.start();
+ }
 onStart();
  } catch ( IOExceptionex ){
 handleFatal( null, ex );

src/test/java/org/java_websocket/issues/Issue855Test.java

@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2010-2019 Nathan Rajlich
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+packageorg.java_websocket.issues;
+
+importorg.java_websocket.WebSocket;
+importorg.java_websocket.client.WebSocketClient;
+importorg.java_websocket.handshake.ClientHandshake;
+importorg.java_websocket.handshake.ServerHandshake;
+importorg.java_websocket.server.WebSocketServer;
+importorg.java_websocket.util.SocketUtil;
+importorg.junit.Test;
+
+importjava.net.InetSocketAddress;
+importjava.net.URI;
+importjava.util.concurrent.CountDownLatch;
+
+publicclassIssue855Test{
+
+CountDownLatchcountServerDownLatch = newCountDownLatch(1);
+CountDownLatchcountDownLatch = newCountDownLatch(1);
+
+@Test(timeout = 2000)
+publicvoidtestIssue() throwsException{
+intport = SocketUtil.getAvailablePort();
+WebSocketClientwebSocket = newWebSocketClient(newURI("ws://localhost:" + port)){
+@Override
+publicvoidonOpen(ServerHandshakehandshakedata){
+countDownLatch.countDown();
+ }
+
+@Override
+publicvoidonMessage(Stringmessage){
+
+ }
+
+@Override
+publicvoidonClose(intcode, Stringreason, booleanremote){
+ }
+
+@Override
+publicvoidonError(Exceptionex){
+
+ }
+ };
+WebSocketServerserver = newWebSocketServer(newInetSocketAddress(port)){
+@Override
+publicvoidonOpen(WebSocketconn, ClientHandshakehandshake){
+conn.close();
+ }
+
+@Override
+publicvoidonClose(WebSocketconn, intcode, Stringreason, booleanremote){
+ }
+
+@Override
+publicvoidonMessage(WebSocketconn, Stringmessage){
+
+ }
+
+@Override
+publicvoidonError(WebSocketconn, Exceptionex){
+
+ }
+
+@Override
+publicvoidonStart(){
+countServerDownLatch.countDown();
+ }
+ };
+newThread(server).start();
+countServerDownLatch.await();
+webSocket.connectBlocking();
+server.stop();
+ }
+}