changeset 624:7c04874db9e4

Merge branch Gaya-8.0.x
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Thu, 01 Aug 2013 13:17:46 +0400
parents 0b723232d304 (current diff) 0d44c31bb36c (diff)
children 4da98ede7aa4
files
diffstat 1 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java	Thu Aug 01 12:51:42 2013 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java	Thu Aug 01 13:17:46 2013 +0400
@@ -4,6 +4,7 @@
 import jetbrains.buildServer.util.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import com.intellij.openapi.util.SystemInfo;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -45,8 +46,16 @@
         //a file and there is a dir with a same name (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6325169)
         if (dir.exists())
           continue;
-        if (!dir.createNewFile())
-          continue;
+        try {
+          if (!dir.createNewFile())
+            continue;
+        } catch (IOException e) {
+          //one more workaround for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6325169
+          if (SystemInfo.isWindows && "Access is denied".equals(e.getMessage()) && dir.exists()) {
+            continue;
+          }
+          throw e;
+        }
         if (!dir.delete())
           continue;
         if (!dir.mkdir())