This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 5f907f33e5565f424c1cb50d279225839e47913a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 27 16:22:00 2015 +0100 amélioration de la suppression d'une pièce jointe --- .../service/AttachmentPersistenceServiceImpl.java | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java index a4e28ec..ebd8515 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java @@ -283,7 +283,31 @@ public class AttachmentPersistenceServiceImpl extends AbstractPersistenceService } measurementFileDao.remove(target.getIdAsInt()); - ApplicationIOUtil.deleteFile(file, t("tutti.persistence.attachment.deleteFile.error", file)); + if (file.exists()) { + ApplicationIOUtil.deleteFile(file, t("tutti.persistence.attachment.deleteFile.error", file)); + } else { + if (log.isWarnEnabled()) { + log.warn("COULD NOT FIND Attachement at " + file); + } + } + + File parentFile = file.getParentFile(); + while (!parentFile.equals(dbAttachmentDirectory)) { + + File[] files = parentFile.listFiles(); + if (files != null && files.length == 0) { + + // can delete this directory + if (log.isDebugEnabled()) { + log.debug("Remove empty directory: " + parentFile); + } + ApplicationIOUtil.deleteDirectory(parentFile, "Could not clean directory"); + parentFile = parentFile.getParentFile(); + } else { + break; + } + + } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.