Only try to load winpthread on windows

Previously, it was loaded in any case, and errors were ignored (in an
ineffective way leading to failures on non-windows).

diff --git a/src/bindings/java/org/simgrid/msg/Msg.java b/src/bindings/java/org/simgrid/msg/Msg.java
index c442da4..f47e945 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/Msg.java
+++ b/src/bindings/java/org/simgrid/msg/Msg.java
@@ -16,14 +16,9 @@ public final class Msg {
        public static void nativeInit() {
                if (isNativeInited)
                        return;
        public static void nativeInit() {
                if (isNativeInited)
                        return;

-               try {
+               
+               if (System.getProperty("os.name").toLowerCase().startsWith("win"))

                        NativeLib.nativeInit("winpthread");
                        NativeLib.nativeInit("winpthread");

-               } catch (Exception e)  {
-                       if (System.getProperty("os.name").toLowerCase().startsWith("win")) {
-                               System.err.println("Cannot load winpthread.dll:");
-                               e.printStackTrace();
-                       }
-               }

 
                NativeLib.nativeInit("simgrid");
                NativeLib.nativeInit("simgrid-java");      
 
                NativeLib.nativeInit("simgrid");
                NativeLib.nativeInit("simgrid-java");      

diff --git a/src/bindings/java/org/simgrid/surf/SurfJNI.java b/src/bindings/java/org/simgrid/surf/SurfJNI.java
index ec066f3..abd3a25 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/SurfJNI.java
+++ b/src/bindings/java/org/simgrid/surf/SurfJNI.java
@@ -13,9 +13,8 @@ import org.simgrid.NativeLib;
 public class SurfJNI {
 
   static {
 public class SurfJNI {
 
   static {

-    try {
-      NativeLib.nativeInit("winpthread");
-    } catch (Exception e) {}
+    if (System.getProperty("os.name").toLowerCase().startsWith("win"))
+        NativeLib.nativeInit("winpthread");

     NativeLib.nativeInit("simgrid");
     NativeLib.nativeInit("surf-java");
     Runtime.getRuntime().addShutdownHook(
     NativeLib.nativeInit("simgrid");
     NativeLib.nativeInit("surf-java");
     Runtime.getRuntime().addShutdownHook(

diff --git a/src/bindings/java/surf.i b/src/bindings/java/surf.i
index 13d23a9..f5ef709 100644 (file)
--- a/src/bindings/java/surf.i
+++ b/src/bindings/java/surf.i
@@ -16,9 +16,8 @@ import org.simgrid.NativeLib;
 %}
 %pragma(java) jniclasscode=%{
   static {
 %}
 %pragma(java) jniclasscode=%{
   static {

-    try {
-      NativeLib.nativeInit("winpthread");
-    } catch (Exception e) {}
+    if (System.getProperty("os.name").toLowerCase().startsWith("win"))
+        NativeLib.nativeInit("winpthread");

     NativeLib.nativeInit("simgrid");
     NativeLib.nativeInit("surf-java");
     Runtime.getRuntime().addShutdownHook(
     NativeLib.nativeInit("simgrid");
     NativeLib.nativeInit("surf-java");
     Runtime.getRuntime().addShutdownHook(