# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@jetbrains.com>
# Date 1375364217 -14400
# Node ID 1765529523021e1d3ec4453de049d6d5d0b4ff27
# Parent  5b248e0be596ac8c8bed88096a55bce4576ddb9d# Parent  376e35ed7801900907f3f2e59f77c0cd4dc71191
Merge branch Gaya-8.0.x

diff -r 5b248e0be596 -r 176552952302 mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java	Thu Aug 01 15:16:31 2013 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java	Thu Aug 01 17:36:57 2013 +0400
@@ -42,18 +42,13 @@
         continue;
 
       synchronized (getTmpDirLock(tmpDirName)) {
-        //windows throws an exception (access denied) when one tries to create
-        //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;
         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()) {
+          //workaround for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6325169
+          if (SystemInfo.isWindows && "Access is denied".equals(e.getMessage()))
             continue;
-          }
           throw e;
         }
         if (!dir.delete())
diff -r 5b248e0be596 -r 176552952302 mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtilTest.java
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtilTest.java	Thu Aug 01 15:16:31 2013 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtilTest.java	Thu Aug 01 17:36:57 2013 +0400
@@ -1,6 +1,7 @@
 package jetbrains.buildServer.buildTriggers.vcs.mercurial;
 
 
+import jetbrains.buildServer.util.FileUtil;
 import jetbrains.buildServer.util.TestFor;
 import org.testng.annotations.Test;
 
@@ -28,9 +29,6 @@
 
   @TestFor(issues = "TW-30589")
   public void createTempFile_should_always_return_unique_dir() throws Exception {
-    if (SystemInfo.isWindows) //disable test on windows due to "access is denied" errors
-      return;
-
     final CountDownLatch allThreadsInitialized = new CountDownLatch(1);
     final Set<File> tmpFiles = new HashSet<File>();
     Runnable createTmpFile = new Runnable() {
@@ -59,5 +57,4 @@
 
     assertEquals("Race condition in createTempDir", threads.size(), tmpFiles.size());
   }
-
 }