From 07a9989f0d6b996ccc920754a3fc455bb5f88a69 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 20 Mar 2017 22:41:16 +0100 Subject: [PATCH] further the jprocess creation by not testing conditions that cannot happen The host and name was tested to not be null in the Java world before arriving here --- src/bindings/java/jmsg_process.cpp | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index b27966d138..16a109dc62 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -74,36 +74,15 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jcla JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv* env, jobject jprocess_arg, jobject jhost) { - jobject jprocess; /* the global reference to the java process instance */ - jstring jname; /* the name of the java process instance */ - - - /* get the name of the java process */ - jname = jprocess_get_name(jprocess_arg, env); - if (!jname) { - jxbt_throw_null(env, xbt_strdup("Process name cannot be nullptr")); - return; - } - const char* name = env->GetStringUTFChars(jname, 0); - - /* bind/retrieve the msg host */ - msg_host_t host = jhost_get_native(env, jhost); - if (!host) { - jxbt_throw_notbound(env, "host", jhost); - return; - } - /* create a global java process instance */ - jprocess = jprocess_ref(jprocess_arg, env); - if (!jprocess) { - jxbt_throw_jni(env, "Can't get a global ref to the java process"); - return; - } + jobject jprocess = jprocess_ref(jprocess_arg, env); /* Actually build the MSG process */ + jstring jname = jprocess_get_name(jprocess_arg, env); + const char* name = env->GetStringUTFChars(jname, 0); msg_process_t process = MSG_process_create_from_stdfunc( name, [jprocess]() -> void { simgrid::kernel::context::java_main_jprocess(jprocess); }, - /*data*/ nullptr, host, /* properties*/ nullptr); + /*data*/ nullptr, jhost_get_native(env, jhost), /* properties*/ nullptr); env->ReleaseStringUTFChars(jname, name); /* bind the java process instance to the native process */ -- 2.20.1