Merge remote-tracking branch 'origin/master'

diff --git a/.travis.yml b/.travis.yml
index ebe6fc1..544b719 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,7 +64,7 @@ jobs:
       -  du -hs /tmp || true
       -  ctest --output-on-failure -R java
       -  df -h
-      -  du -hs /tmp || true
+      -  du -hc /tmp || true
 #      -  mingw32-make.exe VERBOSE=1 java-all && ctest --output-on-failure -R java
     - os: osx
       osx_image: xcode11

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index a338cc3..5565b1b 100644 (file)
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -165,10 +165,10 @@ public final class NativeLib {
                         try (Stream<Path> paths = Files.walk(dir.toPath())) {
                                 paths.sorted(java.util.Comparator.reverseOrder())
                                      .map(java.nio.file.Path::toFile)
-                                     //.peek(System.out::println) // Prints what gets removed
+                                     //.peek(System.err::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());
+                               System.err.println("Error while cleaning temporary file "+dir.getAbsolutePath()+" during shutdown: "+e.getCause());
                                e.printStackTrace();
                         }
                }