This is an automated email from the git hooks/post-receive script. New commit to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit eba038c640a769d82cf04065522ff386470e258b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 13 12:31:37 2015 +0100 fixes #6817: [TECHN] Ne pas bloquer l'application à l'ouverture même si certains fichiers temporaires ne peuvent être détruit --- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index ed52b60..d2b84b1 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -201,10 +201,16 @@ public class TuttiConfiguration extends ApplicationConfiguration { File tmpDirectory = getTmpDirectory(); if (tmpDirectory.exists()) { - if (tmpDirectory.isFile()) { - ApplicationIOUtil.deleteFile(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); - } else { - ApplicationIOUtil.deleteDirectory(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + try { + if (tmpDirectory.isFile()) { + ApplicationIOUtil.deleteFile(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + } else { + ApplicationIOUtil.deleteDirectory(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + } + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't delete temporary directory, but still go forward...",e); + } } } ApplicationIOUtil.forceMkdir(tmpDirectory, t("tutti.io.mkDir.error", tmpDirectory)); @@ -222,9 +228,16 @@ public class TuttiConfiguration extends ApplicationConfiguration { File tmpDirectory = getTmpDirectory(); if (tmpDirectory.exists()) { - ApplicationIOUtil.deleteDirectory( - tmpDirectory, - t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + try { + ApplicationIOUtil.deleteDirectory( + tmpDirectory, + t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't delete temporary directory, but still go forward...",e); + } + } + } ApplicationIOUtil.forceMkdir( tmpDirectory, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.