motiejus
/
jgit
1
Fork 0
Code Releases Activity

CloneCommand: Refactor listing of files in deleteChildren 

File.listFiles() returns null if the given File does not represent a
directory, so we can just test for null instead of making a separate
call to FS.DETECTED.isDirectory()

This also avoids a false-positive error from SpotBugs which claims
that there is a potential null-pointer exception on dereferencing the
result of Files.listFiles().

Change-Id: I18e09e391011db997470f5a09d8e38bb604c0213
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2017-12-08 17:13:10 +09:00
parent fdacfaecc4
commit 0e5b9f8a39
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java
View File

@ -77,7 +77,6 @@
import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.TagOpt;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.FileUtils;
/**
@ -681,10 +680,11 @@ private void cleanup() {
}
private void deleteChildren(File file) throws IOException {
if (!FS.DETECTED.isDirectory(file)) {
File[] files = file.listFiles();
if (files == null) {
return;
}
for (File child : file.listFiles()) {
for (File child : files) {
FileUtils.delete(child, FileUtils.RECURSIVE | FileUtils.SKIP_MISSING
| FileUtils.IGNORE_ERRORS);
}