Merge branch 'coverity_scan' of github.com:mquinson/simgrid

[simgrid.git] / src / bindings / java / org / simgrid / NativeLib.java

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index e2931c5..c89c57f 100644 (file)
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -19,15 +19,11 @@ public final class NativeLib {
        public static void nativeInit() {
                if (isNativeInited)
                        return;
-               
+
                if (System.getProperty("os.name").toLowerCase().startsWith("win"))
                        NativeLib.nativeInit("winpthread-1");
 
-               try {
-                       NativeLib.nativeInit("boost_context");
-               } catch (Exception e) {/* Dont care */}
                NativeLib.nativeInit("simgrid");
-               NativeLib.nativeInit("surf-java");
                NativeLib.nativeInit("simgrid-java");      
                isNativeInited = true;
        }
@@ -41,10 +37,12 @@ public final class NativeLib {
                        try {
                                System.loadLibrary(name);
                        } catch (UnsatisfiedLinkError e2) {
-                               System.err.println("Cannot load the bindings to the "+name+" library in path "+getPath());
-                               e.printStackTrace();
-                               System.err.println("This jar file does not seem to fit your system, and I cannot find an installation of SimGrid.");
-                               System.exit(1);
+                               if (! name.equals("boost_context")) {
+                                       System.err.println("Cannot load the bindings to the "+name+" library in path "+getPath());
+                                       e.printStackTrace();
+                                       System.err.println("This jar file does not seem to fit your system, and I cannot find an installation of SimGrid.");
+                                       System.exit(1);
+                               }
                        }
                }
        }