From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 8 May 2014 08:44:11 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_11~88^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1bfdc9a38c22af6a9becf133be154a2fa2bc6589?hp=da4d2b60e1e61d4d5f1ee19a3e2e225c7d431e2c

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/src/bindings/java/jmsg_host.c b/src/bindings/java/jmsg_host.c
index 81ed7f7340..a7d54a38b0 100644
--- a/src/bindings/java/jmsg_host.c
+++ b/src/bindings/java/jmsg_host.c
@@ -69,11 +69,11 @@ Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls,
   jobject jhost;                /* global reference to the java host instance returned  */
 
   /* get the C string from the java string */
-  const char *name = (*env)->GetStringUTFChars(env, jname, 0);
-  if (name == NULL) {
+  if (jname == NULL) {
   	jxbt_throw_null(env,bprintf("No host can have a null name"));
   	return NULL;
   }
+  const char *name = (*env)->GetStringUTFChars(env, jname, 0);
   /* get the host by name       (the hosts are created during the grid resolution) */
   host = MSG_get_host_by_name(name);