aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2019-03-11 14:15:29 +0100
committerSonarTech <sonartech@sonarsource.com>2019-03-19 20:21:24 +0100
commit7e767426a644ba0de987a1f5960ee6569f392bce (patch)
tree6ac310af4a8725e844b8438e73203ba086bb1fc5
parent4e700ebad3cf05bb47cf8335d7956673afe6e7c6 (diff)
downloadsonarqube-7e767426a644ba0de987a1f5960ee6569f392bce.tar.gz
sonarqube-7e767426a644ba0de987a1f5960ee6569f392bce.zip
SONAR-11792 use memory safe implemen to delete deprecated ES dir
-rw-r--r--server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
index cac965a24b0..40bac89b82d 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.function.Supplier;
-import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.application.command.AbstractCommand;
@@ -39,6 +38,7 @@ import org.sonar.application.command.JavaCommand;
import org.sonar.application.command.JvmOptions;
import org.sonar.application.es.EsConnectorImpl;
import org.sonar.application.es.EsInstallation;
+import org.sonar.process.FileUtils2;
import org.sonar.process.ProcessId;
import org.sonar.process.sharedmemoryfile.AllProcessesCommands;
import org.sonar.process.sharedmemoryfile.ProcessCommands;
@@ -125,7 +125,7 @@ public class ProcessLauncherImpl implements ProcessLauncher {
if (outdatedDir.exists()) {
LOG.info("Deleting outdated search index data directory {}", outdatedDir.getAbsolutePath());
try {
- FileUtils.deleteDirectory(outdatedDir);
+ FileUtils2.deleteDirectory(outdatedDir);
} catch (IOException e) {
LOG.info("Failed to delete outdated search index data directory {}", outdatedDir.getAbsolutePath(), e);
}