Remove useless 2nd parameter "catch_block" for try_n_catch_stoprequest().

[simgrid.git] / src / bindings / java / jmsg_task.cpp

diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp
index 47182e2..31b504d 100644 (file)
--- a/src/bindings/java/jmsg_task.cpp
+++ b/src/bindings/java/jmsg_task.cpp
@@ -127,9 +127,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject j
     return;
   }
   msg_error_t rv;
-  simgrid::kernel::context::try_n_catch_stoprequest(
-      [&rv, &task]() { rv = MSG_task_execute(task); },
-      [&env] { jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); });
+  if (not simgrid::kernel::context::try_n_catch_stoprequest([&rv, &task]() { rv = MSG_task_execute(task); })) {
+    jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed");
+  }
 
   if (env->ExceptionOccurred())
     return;
@@ -286,11 +286,11 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive(JNIEnv* env, jclass
 
   const char *alias = env->GetStringUTFChars(jalias, 0);
   msg_error_t rv;
-  simgrid::kernel::context::try_n_catch_stoprequest(
-      [&rv, &task, &alias, &jtimeout]() {
+  if (not simgrid::kernel::context::try_n_catch_stoprequest([&rv, &task, &alias, &jtimeout]() {
         rv = MSG_task_receive_ext(&task, alias, (double)jtimeout, /*host*/ nullptr);
-      },
-      [&env]() { jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); });
+      })) {
+    jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed");
+  }
   env->ReleaseStringUTFChars(jalias, alias);
   if (env->ExceptionOccurred())
     return nullptr;