From: cristianrosa <cristianrosa@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 17 Aug 2009 12:40:52 +0000 (+0000)
Subject: Fix try to fix the JAVA crap!
X-Git-Tag: SVN~1098
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/addf1684268e6863fc702567a8b47a090400428f?ds=inline

Fix try to fix the JAVA crap!

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6570 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/java/jmsg.c b/src/java/jmsg.c
index 0fa342b5a8..83900cc5ff 100644
--- a/src/java/jmsg.c
+++ b/src/java/jmsg.c
@@ -950,6 +950,7 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 
   MSG_global_init(&argc, argv);
   MSG_set_channel_number(10);   /* FIXME: this should not be fixed statically */
+  SIMIX_context_select_factory("java");
 
   for (index = 0; index < argc; index++)
     free(argv[index]);
diff --git a/src/java/simgrid/msg/Msg.java b/src/java/simgrid/msg/Msg.java
index 0c10771d55..0ce4de2bc6 100644
--- a/src/java/simgrid/msg/Msg.java
+++ b/src/java/simgrid/msg/Msg.java
@@ -33,11 +33,11 @@ public final class Msg {
   static {
     try {
       System.loadLibrary("simgrid");
-      MsgNative.selectContextFactory("java");
-    } catch(NativeException e) {
+      //MsgNative.selectContextFactory("java");
+ /*   } catch(NativeException e) {
       System.err.println(e.toString());
       e.printStackTrace();
-      System.exit(1);
+      System.exit(1);*/
     } catch(UnsatisfiedLinkError e) {
       System.err.println("Cannot load simgrid library : ");
       e.printStackTrace();