Skip to content

Commit ae496a3

Browse files
Handle file deletion gracefully in JarFileUtils
JarFileUtils.delete(File f) throw actual exception (instead of FileNotFound) when file cannot be deleted #2825
1 parent b1f5883 commit ae496a3

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ z_build
2626
.DS_Store
2727
outputDir/
2828
**/Version.java
29+
**/bin/

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Current
2+
Fixed: GITHUB-2825: JarFileUtils.delete(File f) throw actual exception (instead of FileNotFound) when file cannot be deleted (Steven Jubb)
23
Fixed: GITHUB2818: Add configuration key for callback discrepancy behavior (Krishnan Mahadevan)
34
Fixed: GITHUB-2819: Ability to retry a data provider in case of failures (Krishnan Mahadevan)
45
Fixed: GITHUB-2308: StringIndexOutOfBoundsException in findClassesInPackage - Surefire/Maven - JDK 11 fails (Krishnan Mahadevan)

testng-core/src/main/java/org/testng/JarFileUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.testng;
22

33
import java.io.File;
4-
import java.io.FileNotFoundException;
54
import java.io.IOException;
65
import java.io.InputStream;
76
import java.nio.file.Files;
@@ -112,7 +111,7 @@ private void delete(File f) throws IOException {
112111
if (f.isDirectory()) {
113112
for (File c : Objects.requireNonNull(f.listFiles())) delete(c);
114113
}
115-
if (!f.delete()) throw new FileNotFoundException("Failed to delete file: " + f);
114+
Files.deleteIfExists(f.toPath());
116115
}
117116

118117
private boolean matchesXmlPathInJar(JarEntry je) {

0 commit comments

Comments
 (0)