Merge concerns - Adrien

[simgrid.git] / src / jmsg_process.c

diff --git a/src/jmsg_process.c b/src/jmsg_process.c
index 213b345..e20c317 100644 (file)
--- a/src/jmsg_process.c
+++ b/src/jmsg_process.c
@@ -267,19 +267,14 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep
        CATCH_ANONYMOUS {
                return;
        }
-       jxbt_check_res("MSG_process_sleep()", rv, MSG_OK,
-                 bprintf("unexpected error , please report this bug"));
+  if (rv != MSG_OK) {
+       jmsg_throw_status(env,rv);
+  }
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
                                      jdouble jseconds)
 {
-  m_process_t process = jprocess_to_native_process(jprocess, env);
-
-  if (!process) {
-    jxbt_throw_notbound(env, "process", jprocess);
-    return;
-  }
   MSG_error_t rv;
   TRY {
         rv = MSG_process_sleep((double)jseconds);
@@ -288,7 +283,8 @@ Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
        return;
   }
   if (rv != MSG_OK) {
-//     smx_ctx_java_stop(smx_ctx_java_self());
+       XBT_INFO("Status NOK");
+       jmsg_throw_status(env,rv);
   }
 }