Synchronize AbstractWebSocket

src/main/java/org/java_websocket/AbstractWebSocket.java

@@ -82,14 +82,20 @@ public abstract class AbstractWebSocket extends WebSocketAdapter {
 	 */
 	private boolean websocketRunning = false;
 
+	/**
+	 * Attribute to sync on
+	 */
+	private final Object syncConnectionLost = new Object();
     /**
      * Get the interval checking for lost connections
      * Default is 60 seconds
      * @return the interval
 	 * @since 1.3.4
      */
     public int getConnectionLostTimeout() {
-        return connectionLostTimeout;
+		synchronized (syncConnectionLost) {
+			return connectionLostTimeout;
+		}
     }
 
     /**
@@ -100,54 +106,60 @@ public int getConnectionLostTimeout() {
 	 * @since 1.3.4
      */
     public void setConnectionLostTimeout( int connectionLostTimeout ) {
-        this.connectionLostTimeout = connectionLostTimeout;
-        if (this.connectionLostTimeout <= 0) {
-			log.trace( "Connection lost timer stopped" );
-			cancelConnectionLostTimer();
-            return;
+        synchronized (syncConnectionLost) {
+            this.connectionLostTimeout = connectionLostTimeout;
+            if (this.connectionLostTimeout <= 0) {
+                log.trace("Connection lost timer stopped");
+                cancelConnectionLostTimer();
+                return;
+            }
+            if (this.websocketRunning) {
+                log.trace("Connection lost timer restarted");
+                //Reset all the pings
+                try {
+                    ArrayList<WebSocket> connections = new ArrayList<WebSocket>(getConnections());
+                    WebSocketImpl webSocketImpl;
+                    for (WebSocket conn : connections) {
+                        if (conn instanceof WebSocketImpl) {
+                            webSocketImpl = (WebSocketImpl) conn;
+                            webSocketImpl.updateLastPong();
+                        }
+                    }
+                } catch (Exception e) {
+                    log.error("Exception during connection lost restart", e);
+                }
+                restartConnectionLostTimer();
+            }
         }
-        if (this.websocketRunning) {
-        	log.trace( "Connection lost timer restarted" );
-			//Reset all the pings
-			try {
-				ArrayList<WebSocket> connections = new ArrayList<WebSocket>( getConnections() );
-				WebSocketImpl webSocketImpl;
-				for( WebSocket conn : connections ) {
-					if( conn instanceof WebSocketImpl ) {
-						webSocketImpl = ( WebSocketImpl ) conn;
-						webSocketImpl.updateLastPong();
-					}
-				}
-			} catch (Exception e) {
-				log.error("Exception during connection lost restart", e);
-			}
-			restartConnectionLostTimer();
-		}
     }
 
     /**
      * Stop the connection lost timer
 	 * @since 1.3.4
      */
     protected void stopConnectionLostTimer() {
-        if (connectionLostTimer != null ||connectionLostTimerTask != null) {
-			this.websocketRunning = false;
-			log.trace( "Connection lost timer stopped" );
-            cancelConnectionLostTimer();
+        synchronized (syncConnectionLost) {
+            if (connectionLostTimer != null || connectionLostTimerTask != null) {
+                this.websocketRunning = false;
+                log.trace("Connection lost timer stopped");
+                cancelConnectionLostTimer();
+            }
         }
     }
     /**
      * Start the connection lost timer
 	 * @since 1.3.4
      */
     protected void startConnectionLostTimer() {
-        if (this.connectionLostTimeout <= 0) {
-          	log.trace("Connection lost timer deactivated");
-            return;
+        synchronized (syncConnectionLost) {
+            if (this.connectionLostTimeout <= 0) {
+                log.trace("Connection lost timer deactivated");
+                return;
+            }
+            log.trace("Connection lost timer started");
+            this.websocketRunning = true;
+            restartConnectionLostTimer();
         }
-		log.trace("Connection lost timer started");
-        this.websocketRunning = true;
-       	restartConnectionLostTimer();
     }
 
 	/**

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

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2010-2018 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.
+ *
+ */
+
+package org.java_websocket.issues;
+
+import org.java_websocket.WebSocket;
+import org.java_websocket.handshake.ClientHandshake;
+import org.java_websocket.server.WebSocketServer;
+import org.java_websocket.util.SocketUtil;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.concurrent.CountDownLatch;
+
+public class Issue811Test {
+    private CountDownLatch countServerDownLatch = new CountDownLatch(1);
+
+    @Test(timeout = 2000)
+    public void testSetConnectionLostTimeout() throws IOException, InterruptedException {
+        final MyWebSocketServer server = new MyWebSocketServer(new InetSocketAddress(SocketUtil.getAvailablePort()));
+        server.start();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                while (server.getConnectionLostTimeout() == 60) {
+                    // do nothing
+                }
+                // will never reach this statement
+                countServerDownLatch.countDown();
+            }
+        }).start();
+        Thread.sleep(1000);
+        server.setConnectionLostTimeout(20);
+        countServerDownLatch.await();
+    }
+
+    private static class MyWebSocketServer extends WebSocketServer {
+        public MyWebSocketServer(InetSocketAddress inetSocketAddress) {
+            super(inetSocketAddress);
+        }
+
+        @Override
+        public void onOpen(WebSocket conn, ClientHandshake handshake) {
+
+        }
+
+        @Override
+        public void onClose(WebSocket conn, int code, String reason, boolean remote) {
+
+        }
+
+        @Override
+        public void onMessage(WebSocket conn, String message) {
+
+        }
+
+        @Override
+        public void onError(WebSocket conn, Exception ex) {
+
+        }
+
+        @Override
+        public void onStart() {
+
+        }
+    }
+}