MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-47412 (file deletion behavior restored)

Browse Source
This commit is contained in:
Roman Shevchenko
2013-07-03 18:06:09 +02:00
parent 75e8d3e26f
commit a7888090d7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java
+6 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -464,8 +464,8 @@ public class FileUtilRt {
}
public static @Nullable <T, E extends Throwable> T doIOOperation(@NotNull RetriableIOOperation<T, E> ioTask) throws E {
for (int i = 0; i < MAX_FILE_IO_ATTEMPTS;) {
T result = ioTask.execute(++i == MAX_FILE_IO_ATTEMPTS);
for (int i = MAX_FILE_IO_ATTEMPTS; i > 0; i--) {
T result = ioTask.execute(i == 1);
if (result != null) return result;
try {
@@ -481,7 +481,9 @@ public class FileUtilRt {
Boolean result = doIOOperation(new RetriableIOOperation<Boolean, RuntimeException>() {
@Override
public Boolean execute(boolean lastAttempt) {
return file.delete() || !file.exists();
if (file.delete() || !file.exists()) return Boolean.TRUE;
else if (lastAttempt) return Boolean.FALSE;
else return null;
}
});
return Boolean.TRUE.equals(result);