From: alebre <alebre@noname-2.local>
Date: Tue, 12 Jun 2012 20:44:40 +0000 (+0200)
Subject: Merge branch 'master' of git://scm.gforge.inria.fr/simgrid/simgrid-java
X-Git-Tag: v3_9_90~569^2~19^2~55
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1446114c6c22422d849890eb968340074a29b2a1?hp=0fee76cf390f76e01411439d6f3590ac7dc158ff

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

diff --git a/src/smx_context_cojava.c b/src/smx_context_cojava.c
index 2905ece3ef..58efe2d555 100644
--- a/src/smx_context_cojava.c
+++ b/src/smx_context_cojava.c
@@ -33,13 +33,7 @@ static smx_context_t maestro_context = NULL;
 xbt_dynar_t cojava_processes;
 static unsigned long int cojava_process_index = 0;
 
-static JavaVM *get_current_vm(void);
-static JavaVM *get_current_vm(void)
-{
-	JavaVM *jvm;
-	JNI_GetCreatedJavaVMs(&jvm,1,NULL);
-  return jvm;
-}
+extern JavaVM *__java_vm;
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);