Automatic merge from branch-5.4

* origin/branch-5.4:
  Refactor a bit ComponentContainer
  stabilize ProjectDrilldownTest
  SONAR-7125 use efficient delete dir code in core, batch and server
  SONAR-7125 use efficient delete dir from NIO in sonar-api
  SONAR-7125 add FileUtils in sonar-core with efficient delete methods
  SONAR-7125 use efficient delete dir method in sonar-process
  SONAR-7125 use nio to clean temp directory at startup

1 files changed, 3 insertions, 2 deletions

diff --git a/sonar-application/src/main/java/org/sonar/application/AppFileSystem.java b/sonar-application/src/main/java/org/sonar/application/AppFileSystem.java
index b71ba43faae..c195008a638 100644
--- a/sonar-application/src/main/java/org/sonar/application/AppFileSystem.java
+++ b/sonar-application/src/main/java/org/sonar/application/AppFileSystem.java
@@ -26,8 +26,8 @@ import org.slf4j.LoggerFactory;
 import org.sonar.process.Props;
 import org.sonar.process.monitor.FileSystem;
 
-import static org.apache.commons.io.FileUtils.cleanDirectory;
 import static org.apache.commons.io.FileUtils.forceMkdir;
+import static org.sonar.process.FileUtils.cleanDirectory;
 import static org.sonar.process.ProcessProperties.PATH_DATA;
 import static org.sonar.process.ProcessProperties.PATH_HOME;
 import static org.sonar.process.ProcessProperties.PATH_LOGS;
@@ -111,9 +111,10 @@ public class AppFileSystem implements FileSystem {
 
   private static void createOrCleanDirectory(Props props, String propKey) throws IOException {
     File dir = props.nonNullValueAsFile(propKey);
-    LOG.info("Cleaning and/or creating temp directory {}", dir.getAbsolutePath());
+    LOG.info("Cleaning or creating temp directory {}", dir.getAbsolutePath());
     if (!createDirectory(props, propKey)) {
       cleanDirectory(dir);
     }
   }
+
 }