From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 2 Oct 2015 07:27:51 +0000 (+0200)
Subject: Only try to load winpthread on windows
X-Git-Tag: v3_12~68
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fad8716cc830fe1d7ca8b3b3224afab1e6a7e45a

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 c442da4260..f47e945316 100644
--- 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;
-	        try {
+	        
+		if (System.getProperty("os.name").toLowerCase().startsWith("win"))
 			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");      
diff --git a/src/bindings/java/org/simgrid/surf/SurfJNI.java b/src/bindings/java/org/simgrid/surf/SurfJNI.java
index ec066f3e1a..abd3a25f48 100644
--- 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 {
-    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(
diff --git a/src/bindings/java/surf.i b/src/bindings/java/surf.i
index 13d23a93ca..f5ef7097fd 100644
--- a/src/bindings/java/surf.i
+++ b/src/bindings/java/surf.i
@@ -16,9 +16,8 @@ import org.simgrid.NativeLib;
 %}
 %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(