Propagate recent modifications of change_host function to java.

[simgrid.git] / src / java / jmsg.c

diff --git a/src/java/jmsg.c b/src/java/jmsg.c
index 61fef1c..681c19e 100644 (file)
--- a/src/java/jmsg.c
+++ b/src/java/jmsg.c
@@ -302,14 +302,8 @@ Java_simgrid_msg_MsgNative_processSelfPPID(JNIEnv* env, jclass cls) {
 }
 
 JNIEXPORT void JNICALL 
-Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv* env, jclass cls, jobject jprocess, jobject jhost){
+Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv* env, jclass cls, jobject jhost){
   m_host_t host = jhost_get_native(env,jhost);
-  m_process_t process = jprocess_to_native_process(jprocess,env);
-       
-  if(!process) {
-    jxbt_throw_notbound(env,"process",jprocess);
-    return;
-  }
        
   if(!host) {
     jxbt_throw_notbound(env,"host",jhost);
@@ -317,7 +311,7 @@ Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv* env, jclass cls, jobject jp
   }
 
   /* try to change the host of the process */
-  if(MSG_OK != MSG_process_change_host(process,host))
+  if(MSG_OK != MSG_process_change_host(host))
     jxbt_throw_native(env, xbt_strdup("MSG_process_change_host() failed"));
 }
 
@@ -844,7 +838,7 @@ Java_simgrid_msg_Msg_init(JNIEnv* env, jclass cls, jobjectArray jargs) {
 
   argc++;
        
-  argv = xbt_new0(char*,1);
+  argv = xbt_new0(char*, argc);
         
   argv[0] = strdup("java");
        
@@ -988,7 +982,7 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg) {
 JNIEXPORT void JNICALL 
 Java_simgrid_msg_MsgNative_selectContextFactory(JNIEnv * env, jclass class,jstring jname)
 {
-   char *errmsg=NULL;
+   char *errmsg = NULL;
    xbt_ex_t e;
        
    /* get the C string from the java string*/
@@ -1001,7 +995,7 @@ Java_simgrid_msg_MsgNative_selectContextFactory(JNIEnv * env, jclass class,jstri
       xbt_ex_free(e);
    }
    
-       (*env)->ReleaseStringUTFChars(env, jname, name);
+   (*env)->ReleaseStringUTFChars(env, jname, name);
        
    if(errmsg) {
       char *thrown = bprintf("xbt_select_context_factory() failed: %s",errmsg);