Improve usage of temp directory at startup

1 files changed, 2 insertions, 11 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/mavendeployer/Mojo.java b/sonar-server/src/main/java/org/sonar/server/mavendeployer/Mojo.java
index 615dbf4ae52..a17b19847c3 100644
--- a/sonar-server/src/main/java/org/sonar/server/mavendeployer/Mojo.java
+++ b/sonar-server/src/main/java/org/sonar/server/mavendeployer/Mojo.java
@@ -21,6 +21,7 @@ package org.sonar.server.mavendeployer;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
+import org.sonar.api.utils.TempFileUtils;
 import org.sonar.api.utils.ZipUtils;
 
 import java.io.File;
@@ -43,7 +44,7 @@ public final class Mojo extends Artifact {
 
   @Override
   protected void copyTo(File toDir) throws IOException {
-    File tmpDir = prepareTmpDir();
+    File tmpDir = TempFileUtils.createTempDirectory("sonar-server-");
     try {
       copyTo(toDir, tmpDir);
 
@@ -69,16 +70,6 @@ public final class Mojo extends Artifact {
     return before + "<version>" + version + "</version>" + after;
   }
 
-  private File prepareTmpDir() throws IOException {
-    File tmpDir = new File(System.getProperty("java.io.tmpdir"), "sonar-" + version);
-    if (tmpDir.exists()) {
-      FileUtils.cleanDirectory(tmpDir);
-    } else {
-      FileUtils.forceMkdir(tmpDir);
-    }
-    return tmpDir;
-  }
-
   private void destroyTmpDir(File tmpDir) {
     if (tmpDir != null) {
       FileUtils.deleteQuietly(tmpDir);