fix (#220) ?

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

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index 528510a..31d5ba8 100644 (file)
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -51,7 +51,10 @@ JNIEnv *get_current_thread_env()
 {
   using simgrid::kernel::context::JavaContext;
   JavaContext* ctx = static_cast<JavaContext*>(simgrid::kernel::context::Context::self());
-  return ctx->jenv_;
+  if (ctx)
+    return ctx->jenv_;
+  else
+    return nullptr;
 }
 
 void jmsg_throw_status(JNIEnv *env, msg_error_t status) {
@@ -270,7 +273,7 @@ static void run_jprocess(JNIEnv *env, jobject jprocess)
     env->ExceptionClear();
     XBT_ATTRIB_UNUSED jint error = __java_vm->DetachCurrentThread();
     xbt_assert(error == JNI_OK, "Cannot detach failing thread");
-    simgrid::kernel::context::throw_stoprequest();
+    simgrid::kernel::context::StopRequest::do_throw();
   }
 }