From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Mon, 7 Oct 2019 21:44:55 +0000 (+0200)
Subject: java: obey to sonar, use nio.file.delete for better error messages
X-Git-Tag: v3.24~15
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4ee3c75a375b31887676236fd5555c39e15a671a

java: obey to sonar, use nio.file.delete for better error messages
---

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index e19be694ac..b00f324976 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -162,11 +162,11 @@ public final class NativeLib {
 		@Override
 		public void run() {
 			try {
-				for (File f : dir.listFiles())
-					if (! f.delete() && !f.getAbsolutePath().contains("travis") && !f.getAbsolutePath().contains("appveyor")) // Be silent on Travis to not break the tests. Ugly trick :)
-						System.out.println("Unable to clean temporary file "+f.getAbsolutePath()+" during shutdown.");
-				if (! dir.delete() && !dir.getAbsolutePath().contains("travis") && !dir.getAbsolutePath().contains("appveyor"))
-					System.out.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown.");			    	
+                                Files.walk(dir.toPath())
+                                     .sorted(java.util.Comparator.reverseOrder())
+                                     .map(java.nio.file.Path::toFile)
+                                     //.peek(System.out::println) // Prints what gets removed
+                                     .forEach(java.io.File::delete);
 			} catch(Exception e) {
 				System.out.println("Error while cleaning temporary file "+dir.getAbsolutePath()+" during shutdown: "+e.getCause());
 				e.printStackTrace();
diff --git a/src/bindings/java/org/simgrid/msg/Process.java b/src/bindings/java/org/simgrid/msg/Process.java
index deb22de04e..cfbc5dabef 100644
--- a/src/bindings/java/org/simgrid/msg/Process.java
+++ b/src/bindings/java/org/simgrid/msg/Process.java
@@ -253,8 +253,8 @@ public abstract class Process implements Runnable {
 	public native void migrate(Host host);	
 	/**
 	 * Makes the current process sleep until millis milliseconds have elapsed.
-	 * You should note that unlike "waitFor" which takes seconds, this method takes milliseconds.
-	 * FIXME: Not optimal, maybe we should have two native functions.
+	 * You should note that unlike "waitFor" which takes seconds (as usual in SimGrid), this method takes milliseconds (as usual for sleep() in Java).
+	 * 
 	 * @param millis the length of time to sleep in milliseconds.
 	 */
 	public static void sleep(long millis) throws HostFailureException  {