[royale-compiler] branch develop updated: royaleunit-ant-tasks: stop timeout timer if server is stopped before the timeout

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new ba80ead  royaleunit-ant-tasks: stop timeout timer if server is stopped before the timeout
ba80ead is described below

commit ba80ead630fab658a5c7d6768a2c673cfef92f6c
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Thu May 23 14:23:27 2019 -0700

    royaleunit-ant-tasks: stop timeout timer if server is stopped before the timeout
---
 .../java/org/apache/royale/test/ant/RoyaleUnitWebSocketServer.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/RoyaleUnitWebSocketServer.java b/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/RoyaleUnitWebSocketServer.java
index edee5cb..2d84f0e 100644
--- a/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/RoyaleUnitWebSocketServer.java
+++ b/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/RoyaleUnitWebSocketServer.java
@@ -54,6 +54,12 @@ public class RoyaleUnitWebSocketServer extends WebSocketServer implements IRoyal
     public void stop() throws IOException, InterruptedException
     {
         LoggingUtil.log("\nStopping server ...");
+
+        if(timeoutTimer != null)
+        {
+            timeoutTimer.cancel();
+            timeoutTimer = null;
+        }
         
         for(WebSocket socket : getConnections())
         {