Author: tchemit Date: 2014-03-20 12:09:06 +0100 (Thu, 20 Mar 2014) New Revision: 1629 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1629 Log: fixes #4696: suite derni?\195?\168re anomalie j'essaye de relance Tutti : erreur Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-03-20 10:24:32 UTC (rev 1628) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-03-20 11:09:06 UTC (rev 1629) @@ -28,13 +28,10 @@ import com.google.common.base.Predicate; import com.google.common.collect.Sets; import com.google.common.io.Files; -import org.nuiton.jaxx.application.ApplicationConfiguration; -import org.nuiton.jaxx.application.ApplicationIOUtil; -import org.nuiton.jaxx.application.ApplicationTechnicalException; +import fr.ifremer.tutti.persistence.RessourceClassLoader; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.persistence.RessourceClassLoader; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -44,6 +41,9 @@ import org.nuiton.config.ApplicationConfigHelper; import org.nuiton.config.ApplicationConfigProvider; import org.nuiton.config.ArgumentsParserException; +import org.nuiton.jaxx.application.ApplicationConfiguration; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.Version; import javax.swing.KeyStroke; @@ -165,7 +165,11 @@ File tmpDirectory = getTmpDirectory(); if (tmpDirectory.exists()) { - ApplicationIOUtil.deleteDirectory(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + if (tmpDirectory.isFile()) { + ApplicationIOUtil.deleteFile(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + } else { + ApplicationIOUtil.deleteDirectory(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + } } ApplicationIOUtil.forceMkdir(tmpDirectory, t("tutti.io.mkDir.error", tmpDirectory));