Merge branch 'master' into mc

[simgrid.git] / src / bindings / java / jmsg_comm.c

diff --git a/src/bindings/java/jmsg_comm.c b/src/bindings/java/jmsg_comm.c
index 8fcd7ac..2de313c 100644 (file)
--- a/src/bindings/java/jmsg_comm.c
+++ b/src/bindings/java/jmsg_comm.c
@@ -1,11 +1,16 @@
-/* Functions related to the java comm instances                                                                                                                                */
+/* Functions related to the java comm instances                             */
+
+/* Copyright (c) 2012-2014. 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. */
 
-/* Copyright (c) 2012. The SimGrid Team. All rights reserved.                   */
 #include "jmsg_comm.h"
 #include "jxbt_utilities.h"
 #include "jmsg.h"
 
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
 static jfieldID jcomm_field_Comm_bind;
@@ -57,7 +62,7 @@ Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls) {
 }
 
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Comm_destroy(JNIEnv *env, jobject jcomm) {
+Java_org_simgrid_msg_Comm_nativeFinalize(JNIEnv *env, jobject jcomm) {
   msg_comm_t comm;
   msg_task_t *task_received;
 
@@ -82,28 +87,17 @@ Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm) {
     jxbt_throw_native(env,bprintf("comm is null"));
     return JNI_FALSE;
   }
-  xbt_ex_t e;
-  TRY {
-    if (MSG_comm_test(comm)) {
-      msg_error_t status = MSG_comm_get_status(comm);
-      if (status == MSG_OK) {
-        jcomm_bind_task(env,jcomm);
-        return JNI_TRUE;
-      }
-      else {
-        //send the correct exception
-        jmsg_throw_status(env,status);
-        return JNI_FALSE;
-      }
-    }
-    else {
-      return JNI_FALSE;
+
+  if (MSG_comm_test(comm)) {
+    msg_error_t status = MSG_comm_get_status(comm);
+    if (status == MSG_OK) {
+      jcomm_bind_task(env,jcomm);
+      return JNI_TRUE;
+    } else {
+      //send the correct exception
+      jmsg_throw_status(env,status);
     }
   }
-  CATCH(e) {
-    xbt_ex_free(e);
-  }
-
   return JNI_FALSE;
 }
 JNIEXPORT void JNICALL
@@ -120,13 +114,7 @@ Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble tim
   }
 
   msg_error_t status;
-  xbt_ex_t e;
-  TRY {
-    status = MSG_comm_wait(comm,(double)timeout);
-  }
-  CATCH(e) {
-    xbt_ex_free(e);
-  }
+  status = MSG_comm_wait(comm,(double)timeout);
   (*env)->SetBooleanField(env, jcomm, jcomm_field_Comm_finished, JNI_TRUE);
   if (status == MSG_OK) {
     jcomm_bind_task(env,jcomm);