From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 4 Jun 2016 16:31:29 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_14~1056
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e54471e47acaaa087f58c62c3ec142e911e30d40?hp=28c048989504fa2c1f890d9a91784065e32de37d

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 7865f1c47b..35527c0333 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -112,7 +112,7 @@ public final class NativeLib {
 		try {
 			// We must write the lib onto the disk before loading it -- stupid operating systems
 			if (tempDir == null) {
-				tempDir = Files.createTempDirectory("simgrid-java");
+				tempDir = Files.createTempDirectory("simgrid-java-");
 				// don't leak the files on disk, but remove it on JVM shutdown
 				Runtime.getRuntime().addShutdownHook(new Thread(new FileCleaner(tempDir.toFile())));
 			}
@@ -143,11 +143,13 @@ public final class NativeLib {
 		@Override
 		public void run() {
 			try {
-			    for (File f : dir.listFiles())
-			        f.delete();
-				dir.delete();
+				for (File f : dir.listFiles())
+					if (! f.delete() )
+						System.err.println("Unable to clean temporary file "+f.getAbsolutePath()+" during shutdown.");
+			    if (! dir.delete() )
+					System.err.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown.");			    	
 			} catch(Exception e) {
-				System.out.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown.");
+				System.err.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown: "+e.getCause());
 				e.printStackTrace();
 			}
 		}