From 86bc7fd152df6e257465f2051d482443a17f6c53 Mon Sep 17 00:00:00 2001
From: Samuel Lepetit <samuel.lepetit@inria.fr>
Date: Thu, 14 Jun 2012 17:40:45 +0200
Subject: [PATCH] Bugfix in Task.execute (simulation crash when Process killed
 when there was a task being executed)

---
 src/jmsg_task.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/jmsg_task.c b/src/jmsg_task.c
index b7584644b4..6d9d87a77e 100644
--- a/src/jmsg_task.c
+++ b/src/jmsg_task.c
@@ -217,13 +217,16 @@ Java_org_simgrid_msg_Task_execute(JNIEnv * env,
     jxbt_throw_notbound(env, "task", jtask);
     return;
   }
-
-  MSG_error_t rv = MSG_task_execute(task);
-
-  jxbt_check_res("MSG_task_execute()", rv,
-                 MSG_HOST_FAILURE | MSG_TASK_CANCELED,
-                 bprintf("while executing task %s",
-                         MSG_task_get_name(task)));
+  MSG_error_t rv;
+  TRY {
+     rv = MSG_task_execute(task);
+  }
+  CATCH_ANONYMOUS {
+  	return;
+  }
+  if (rv != MSG_OK) {
+  	jmsg_throw_status(env, rv);
+  }
 }
 
 JNIEXPORT jstring JNICALL
@@ -369,7 +372,6 @@ Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask,
 
   if (rv != MSG_OK) {
   	jmsg_throw_status(env, rv);
-  	return;
   }
 }
 
-- 
2.20.1