Deobfuscate error checking.

diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp
index e5567f7..798d8f2 100644 (file)
--- a/src/bindings/java/jmsg_task.cpp
+++ b/src/bindings/java/jmsg_task.cpp
@@ -115,8 +115,8 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_cancel(JNIEnv * env, jobject jt
   }
 
   msg_error_t rv = MSG_task_cancel(ptask);
-
-  jxbt_check_res("MSG_task_cancel()", rv, MSG_OK, "unexpected error , please report this bug");
+  if (rv != MSG_OK)
+    xbt_die("MSG_task_cancel() unexpectedly failed with error code %d. Please report this bug", rv);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject jtask)

diff --git a/src/bindings/java/jxbt_utilities.hpp b/src/bindings/java/jxbt_utilities.hpp
index fc8cff7..4106d32 100644 (file)
--- a/src/bindings/java/jxbt_utilities.hpp
+++ b/src/bindings/java/jxbt_utilities.hpp
@@ -33,21 +33,6 @@ jmethodID jxbt_get_static_smethod(JNIEnv* env, const char* classname, const char
 /* Search a field in a class and throw an exception if not found (it's ok to to pass a NULL class: it's a noop) */
 jfieldID jxbt_get_sfield(JNIEnv* env, const char* classname, const char* name, const char* signature);
 
-#define jxbt_check_res(fun, res, allowed_exceptions, detail)                                                           \
-  do {                                                                                                                 \
-    if ((res) != MSG_OK && ((res) | (allowed_exceptions))) {                                                           \
-      xbt_die("%s failed with error code %d, which is not an allowed exception. Please fix me.", (fun), (res));        \
-    } else if ((res) == MSG_HOST_FAILURE) {                                                                            \
-      jxbt_throw_host_failure(env, (detail));                                                                          \
-    } else if ((res) == MSG_TRANSFER_FAILURE) {                                                                        \
-      jxbt_throw_transfer_failure(env, (detail));                                                                      \
-    } else if ((res) == MSG_TIMEOUT) {                                                                                 \
-      jxbt_throw_time_out_failure(env, (detail));                                                                      \
-    } else if ((res) == MSG_TASK_CANCELED) {                                                                           \
-      jxbt_throw_task_cancelled(env, (detail));                                                                        \
-    }                                                                                                                  \
-  } while (0)
-
 /* Throws an exception according to its name */
 void jxbt_throw_by_name(JNIEnv* env, const char* name, const std::string& msg);
 /** Thrown on internal error of this layer, or on problem with JNI */