SONAR-5062 Improve stability of tests

diff --git a/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java b/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java
index 085e83b0f4b99b41dc855ed844c1c7762248fd1d..a02eefc6d3e1f162f6b4d23e8cf109fba039218b 100644 (file)
--- a/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java
+++ b/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java
@@ -189,7 +189,10 @@ public class FileCache {
       File tempDir = createTempDir();
       ZipUtils.unzip(cachedFile, tempDir, new LibFilter());
       try {
-        FileUtils.moveDirectory(tempDir, destDir);
+        // Recheck in case of concurrent processes
+        if (!destDir.exists()) {
+          FileUtils.moveDirectory(tempDir, destDir);
+        }
       } catch (FileExistsException e) {
         // Ignore as is certainly means a concurrent process has unziped the same file
       }