Fix FS_Win32 if a non-directory is listed
FS.list() is supposed to return an empty array if the File given is not a directory. Bug: 550111 Change-Id: I245da5f1f2bdafd9dfb38fb8d7eff27d900cd5a8 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
parent
0588dd0a9f
commit
8dcb86b602
|
@ -16,6 +16,7 @@
|
||||||
import java.nio.file.FileVisitOption;
|
import java.nio.file.FileVisitOption;
|
||||||
import java.nio.file.FileVisitResult;
|
import java.nio.file.FileVisitResult;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.LinkOption;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.SimpleFileVisitor;
|
import java.nio.file.SimpleFileVisitor;
|
||||||
import java.nio.file.attribute.BasicFileAttributes;
|
import java.nio.file.attribute.BasicFileAttributes;
|
||||||
|
@ -96,6 +97,9 @@ public boolean retryFailedLockFileCommit() {
|
||||||
/** {@inheritDoc} */
|
/** {@inheritDoc} */
|
||||||
@Override
|
@Override
|
||||||
public Entry[] list(File directory, FileModeStrategy fileModeStrategy) {
|
public Entry[] list(File directory, FileModeStrategy fileModeStrategy) {
|
||||||
|
if (!Files.isDirectory(directory.toPath(), LinkOption.NOFOLLOW_LINKS)) {
|
||||||
|
return NO_ENTRIES;
|
||||||
|
}
|
||||||
List<Entry> result = new ArrayList<>();
|
List<Entry> result = new ArrayList<>();
|
||||||
FS fs = this;
|
FS fs = this;
|
||||||
boolean checkExecutable = fs.supportsExecute();
|
boolean checkExecutable = fs.supportsExecute();
|
||||||
|
|
Loading…
Reference in New Issue