changeset 630:176552952302

Merge branch Gaya-8.0.x
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Thu, 01 Aug 2013 17:36:57 +0400
parents 5b248e0be596 (current diff) 376e35ed7801 (diff)
children d28d52336ce5
files
diffstat 2 files changed, 3 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- 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())
--- 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());
   }
-
 }