This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 5a41d5578290cacaa779c417510bcb7790e999df Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 16 09:08:52 2016 +0100 ne pas créer le repertoire temporaire en lazy. Au demarage ne pas le supprimer mais le vider (see #8124). --- .../src/main/java/fr/ird/observe/ObserveRunner.java | 2 +- .../main/java/fr/ird/observe/services/ObserveServiceInitializer.java | 3 --- .../main/java/fr/ird/observe/services/ObserveServiceContextTopia.java | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java index c990720..94b6822 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java @@ -454,7 +454,7 @@ public abstract class ObserveRunner extends ApplicationRunner { resourceManager.createDirectory(config, TMP_DIRECTORY); // suppression du contenu du répertoire temporaire - FileUtils.deleteDirectory(config.getTmpDirectory()); + FileUtils.cleanDirectory(config.getTmpDirectory()); // 3 - backup directory diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java index 525951f..70d033e 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java @@ -166,9 +166,6 @@ public class ObserveServiceInitializer { } public File getTemporaryDirectoryRoot() { - if (! temporaryDirectoryRoot.exists()) { - temporaryDirectoryRoot.mkdirs(); - } return temporaryDirectoryRoot; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java index 91a332e..f8ed855 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java @@ -147,9 +147,6 @@ public class ObserveServiceContextTopia { public File createTemporaryDirectory(String prefix) { Set<PosixFilePermission> posixFilePermissions = PosixFilePermissions.fromString("rwxr-x---"); FileAttribute<Set<PosixFilePermission>> fileAttribute = PosixFilePermissions.asFileAttribute(posixFilePermissions); - if (! getTemporaryDirectoryRoot().exists()) { - getTemporaryDirectoryRoot().mkdirs(); - } try { return Files.createTempDirectory(getTemporaryDirectoryRoot().toPath(), prefix, fileAttribute).toFile(); } catch (IOException e) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.