From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 30 Jun 2016 11:01:03 +0000 (+0200)
Subject: cosmetics
X-Git-Tag: v3_14~830
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cdd638ea027eff26979839b7fa8cbf9ddcc09e09?ds=sidebyside

cosmetics
---

diff --git a/examples/java/dht/chord/Node.java b/examples/java/dht/chord/Node.java
index 2cb52d8899..835c316977 100644
--- a/examples/java/dht/chord/Node.java
+++ b/examples/java/dht/chord/Node.java
@@ -44,8 +44,8 @@ public class Node extends Process {
     double nextCheckPredecessorDate = initTime + Common.PERIODIC_CHECK_PREDECESSOR_DELAY;
     double nextLookupDate = initTime + Common.PERIODIC_LOOKUP_DELAY;
 
-    id = Integer.valueOf(args[0]);
-    mailbox = Integer.toString(id);
+    mailbox = args[0];
+    id = Integer.parseInt(args[0]);
 
     fingers = new int[Common.NB_BITS];
     for (i = 0; i < Common.NB_BITS; i++) {
@@ -61,7 +61,7 @@ public class Node extends Process {
     } else {
       int knownId = Integer.valueOf(args[1]);
       deadline = Integer.valueOf(args[3]);
-      //Msg.info("Hey! Let's join the system with the id " + id + ".");
+      Msg.debug("Hey! Let's join the system with the id " + id + ".");
 
       joinSuccess = join(knownId);
     }
diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 150b0cc9e6..6cb2a9e564 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -74,9 +74,7 @@ public final class NativeLib {
 
 		if (arch.matches("^i[3-6]86$"))
 			arch = "x86";
-		else if ("x86_64".equalsIgnoreCase(arch))
-			arch = "amd64";
-		else if ("AMD64".equalsIgnoreCase(arch))
+		else if ("x86_64".equalsIgnoreCase(arch) || "AMD64".equalsIgnoreCase(arch))
 			arch = "amd64";
 
 		if (os.toLowerCase().startsWith("win")){