Merge pull request TooTallNate#586 from marci4/master

marci4 · web-flow · commit 1b2e3dbfe73c · 2017-10-24T21:34:04.000+02:00
Connection lost timer should not start on setter call
diff --git a/src/main/java/org/java_websocket/AbstractWebSocket.java b/src/main/java/org/java_websocket/AbstractWebSocket.java
@@ -81,9 +81,12 @@ public void setConnectionLostTimeout( int connectionLostTimeout ) {
         this.connectionLostTimeout = connectionLostTimeout;
         if (this.connectionLostTimeout <= 0) {
             stopConnectionLostTimer();
-        } else {
-            startConnectionLostTimer();
         }
+        if (connectionLostTimer != null || connectionLostTimerTask != null) {
+			if( WebSocketImpl.DEBUG )
+				System.out.println( "Connection lost timer restarted" );
+			restartConnectionLostTimer();
+		}
     }
 
     /**
@@ -107,18 +110,25 @@ protected void startConnectionLostTimer() {
         }
         if (WebSocketImpl.DEBUG)
             System.out.println("Connection lost timer started");
-        cancelConnectionLostTimer();
-        connectionLostTimer = new Timer();
-        connectionLostTimerTask = new TimerTask() {
+       	restartConnectionLostTimer();
+    }
+
+	/**
+	 * This methods allows the reset of the connection lost timer in case of a changed parameter
+	 */
+	private void restartConnectionLostTimer() {
+		cancelConnectionLostTimer();
+		connectionLostTimer = new Timer();
+		connectionLostTimerTask = new TimerTask() {
 
 			/**
 			 * Keep the connections in a separate list to not cause deadlocks
 			 */
 			private ArrayList<WebSocket> connections = new ArrayList<WebSocket>(  );
-            @Override
-            public void run() {
-                connections.clear();
-                connections.addAll( connections() );
+			@Override
+			public void run() {
+				connections.clear();
+				connections.addAll( connections() );
 				long current = (System.currentTimeMillis()-(connectionLostTimeout * 1500));
 				WebSocketImpl webSocketImpl;
 				for( WebSocket conn : connections ) {
@@ -134,12 +144,12 @@ public void run() {
 					}
 				}
 				connections.clear();
-            }
-        };
-        connectionLostTimer.scheduleAtFixedRate( connectionLostTimerTask,connectionLostTimeout * 1000, connectionLostTimeout * 1000 );
-    }
+			}
+		};
+		connectionLostTimer.scheduleAtFixedRate( connectionLostTimerTask,connectionLostTimeout * 1000, connectionLostTimeout * 1000 );
+	}
 
-    /**
+	/**
      * Getter to get all the currently available connections
      * @return the currently available connections
      */
