X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..ba1c6dce93f9ab740c9d66e268572e5c803b5edb:/src/bindings/java/jmsg_vm.cpp

diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp
index 8e3193b441..af947a2b79 100644
--- a/src/bindings/java/jmsg_vm.cpp
+++ b/src/bindings/java/jmsg_vm.cpp
@@ -1,6 +1,6 @@
 /* Functions related to the Virtual Machines.                               */
 
-/* Copyright (c) 2012-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2012-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -37,13 +37,13 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cl
 
 JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isCreated(JNIEnv* env, jobject jvm)
 {
-  sg_vm_t vm = jvm_get_native(env, jvm);
+  const_sg_vm_t vm = jvm_get_native(env, jvm);
   return sg_vm_is_created(vm);
 }
 
 JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv* env, jobject jvm)
 {
-  sg_vm_t vm = jvm_get_native(env, jvm);
+  const_sg_vm_t vm = jvm_get_native(env, jvm);
   return sg_vm_is_running(vm);
 }
 
@@ -55,7 +55,7 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isMigrating(JNIEnv* env, jobj
 
 JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv* env, jobject jvm)
 {
-  sg_vm_t vm = jvm_get_native(env, jvm);
+  const_sg_vm_t vm = jvm_get_native(env, jvm);
   return sg_vm_is_suspended(vm);
 }
 
@@ -79,7 +79,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv* env, jobject jVm,
   jvm_bind(env, jVm, vm);
   jVm = env->NewGlobalRef(jVm);
   // We use the extension level of the host, even if that's somehow disturbing
-  vm->extension_set(JAVA_HOST_LEVEL, (void*)jVm);
+  vm->extension_set(JAVA_HOST_LEVEL, jVm);
 }
 
 JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_VM_all(JNIEnv* env, jclass cls_arg)
@@ -89,8 +89,8 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_VM_all(JNIEnv* env, jclass c
   std::vector<jobject> vms;
 
   for (size_t i = 0; i < host_count; i++) {
-    auto* vm = dynamic_cast<simgrid::s4u::VirtualMachine*>(hosts[i]);
-    if (vm != nullptr && vm->get_state() != simgrid::s4u::VirtualMachine::state::DESTROYED) {
+    const auto* vm = dynamic_cast<simgrid::s4u::VirtualMachine*>(hosts[i]);
+    if (vm != nullptr && vm->get_state() != simgrid::s4u::VirtualMachine::State::DESTROYED) {
       auto jvm = static_cast<jobject>(vm->extension(JAVA_HOST_LEVEL));
       vms.push_back(jvm);
     }
@@ -152,7 +152,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeMigration(JNIEnv* env, jobj
   sg_host_t host = jhost_get_native(env, jhost);
   if (not simgrid::ForcefulKillException::try_n_catch([&vm, &host]() { sg_vm_migrate(vm, host); })) {
     XBT_VERB("Caught exception during migration");
-    jxbt_throw_host_failure(env, "during migration");
+    jxbt_throw_host_failure(env, " during migration");
   }
 }