|
@@ -2160,24 +2160,19 @@ public abstract class FileSystem extends Configured
|
|
|
private DirectoryEntries entries;
|
|
|
private int i = 0;
|
|
|
|
|
|
- DirListingIterator(Path path) {
|
|
|
+ DirListingIterator(Path path) throws IOException {
|
|
|
this.path = path;
|
|
|
+ this.entries = listStatusBatch(path, null);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public boolean hasNext() throws IOException {
|
|
|
- if (entries == null) {
|
|
|
- fetchMore();
|
|
|
- }
|
|
|
return i < entries.getEntries().length ||
|
|
|
entries.hasMore();
|
|
|
}
|
|
|
|
|
|
private void fetchMore() throws IOException {
|
|
|
- byte[] token = null;
|
|
|
- if (entries != null) {
|
|
|
- token = entries.getToken();
|
|
|
- }
|
|
|
+ byte[] token = entries.getToken();
|
|
|
entries = listStatusBatch(path, token);
|
|
|
i = 0;
|
|
|
}
|