X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8199067e1f2a6ea4d3d8a38df1a4fb3f25d364da..f3e4803befab19389587dd1d9af5ecdeffec551e:/src/bindings/java/jmsg.c

diff --git a/src/bindings/java/jmsg.c b/src/bindings/java/jmsg.c
index 4e0671781b..685e2b38cd 100644
--- a/src/bindings/java/jmsg.c
+++ b/src/bindings/java/jmsg.c
@@ -6,7 +6,7 @@
 /* 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. */
 
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 #include <simgrid/simix.h>
 #include <surf/surfxml_parse.h>
 #include <locale.h>
@@ -67,8 +67,11 @@ void jmsg_throw_status(JNIEnv *env, msg_error_t status) {
     case MSG_HOST_FAILURE:
         jxbt_throw_host_failure(env,NULL);
     break;
+    case MSG_TASK_CANCELED:
+        jxbt_throw_task_cancelled(env,NULL);
+    break;
     default:
-        jxbt_throw_native(env,xbt_strdup("communication failed"));
+        jxbt_throw_native(env,xbt_strdup("undefined message failed (please see jmsg_throw_status function in jmsg.c)"));
   }
 }
 
@@ -101,9 +104,7 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
   const char *tmp;
 
   XBT_LOG_CONNECT(jmsg);
-#ifdef HAVE_TRACING
   XBT_LOG_CONNECT(jtrace);
-#endif
 
   (*env)->GetJavaVM(env, &__java_vm);
 
@@ -123,12 +124,12 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 
   argc++;
   argv = xbt_new(char *, argc + 1);
-  argv[0] = strdup("java");
+  argv[0] = xbt_strdup("java");
 
   for (index = 0; index < argc - 1; index++) {
     jval = (jstring) (*env)->GetObjectArrayElement(env, jargs, index);
     tmp = (*env)->GetStringUTFChars(env, jval, 0);
-    argv[index + 1] = strdup(tmp);
+    argv[index + 1] = xbt_strdup(tmp);
     (*env)->ReleaseStringUTFChars(env, jval, tmp);
   }
   argv[argc] = NULL;
@@ -180,11 +181,12 @@ JNIEXPORT void JNICALL
 
   /* Cleanup java storages */
   storages = MSG_storages_as_dynar();
-  for (index = 0; index < xbt_dynar_length(storages) - 1; index++) {
-    jstorage = (jobject) xbt_lib_get_level(xbt_dynar_get_as(storages,index,msg_storage_t), JAVA_STORAGE_LEVEL);
-    if (jstorage)
-      jstorage_unref(env, jstorage);
-
+  if(!xbt_dynar_is_empty(storages)){
+    for (index = 0; index < xbt_dynar_length(storages) - 1; index++) {
+      jstorage = (jobject) xbt_lib_get_level(xbt_dynar_get_as(storages,index,msg_storage_t), JAVA_STORAGE_LEVEL);
+      if (jstorage)
+        jstorage_unref(env, jstorage);
+    }
   }
   xbt_dynar_free(&storages);
 
@@ -318,4 +320,3 @@ static int create_jprocess(int argc, char *argv[]) {
 
   return 0;
 }
-