[royale-compiler] branch develop updated: royaleunit-ant-tasks: stop process even if the server fails on startup

[joshtynjala]

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 de4bdad  royaleunit-ant-tasks: stop process even if the server fails 
on startup
de4bdad is described below

commit de4bdad6119442d70cf3f673f2482f708a32368f
Author: Josh Tynjala <joshtynj...@apache.org>
AuthorDate: Thu May 23 15:01:47 2019 -0700

    royaleunit-ant-tasks: stop process even if the server fails on startup
---
 .../java/org/apache/royale/test/ant/tasks/TestRun.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git 
a/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/tasks/TestRun.java
 
b/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/tasks/TestRun.java
index abcaedc..531474b 100644
--- 
a/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/tasks/TestRun.java
+++ 
b/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/tasks/TestRun.java
@@ -55,7 +55,7 @@ public class TestRun
     public void run() throws BuildException
     {
         configuration.log();
-        
+
         try
         {
             // setup daemon
@@ -71,11 +71,16 @@ public class TestRun
             //launch the player
             Process process = player.launch();
 
-            // block until daemon is completely done with all test data
-            daemon.get();
-
-            //stop the execution context now that socket thread is done
-            context.stop(process);
+            try
+            {
+                // block until daemon is completely done with all test data
+                daemon.get();
+            }
+            finally
+            {
+                //stop the execution context now that socket thread is done
+                context.stop(process);
+            }
 
             // print summaries and check for failure
             analyzeReports();