From fee88cb042a4f743931ef38552b8e0816a71aa29 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Sat, 21 Mar 2009 16:44:29 +0000
Subject: [PATCH] make sure compilation process is killed when simulation load
 is aborted

---
 .../java/se/sics/cooja/dialogs/CompileContiki.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java b/tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java
index 131e71edd..4e6408f46 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CompileContiki.java,v 1.2 2009/03/10 21:20:08 fros4943 Exp $
+ * $Id: CompileContiki.java,v 1.3 2009/03/21 16:44:29 fros4943 Exp $
  */
 
 package se.sics.cooja.dialogs;
@@ -201,8 +201,15 @@ public class CompileContiki {
         try {
           handleCompilationResultThread.join();
         } catch (Exception e) {
+          /* Make sure process has exited */
+          compileProcess.destroy();
+
+          String msg = e.getMessage();
+          if (e instanceof InterruptedException) {
+            msg = "Aborted by user";
+          }
           throw (MoteTypeCreationException) new MoteTypeCreationException(
-              "Compilation error: " + e.getMessage()).initCause(e);
+              "Compilation error: " + msg).initCause(e);
         }
 
         /* Detect error manually */