Removed listing from IgfsImpl.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/56d05702 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/56d05702 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/56d05702 Branch: refs/heads/ignite-2813 Commit: 56d0570253b7134512ed4d4fcd28ef308b3b4b06 Parents: d139289 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Mar 15 15:22:27 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Mar 15 15:22:27 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/igfs/IgfsImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/56d05702/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index 0e52927..3eaf02f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -869,10 +869,14 @@ public final class IgfsImpl implements IgfsEx { data.groupBlockSize())); // Perform the listing. - for (Map.Entry<String, IgfsListingEntry> e : info.listing().entrySet()) { - IgfsPath p = new IgfsPath(path, e.getKey()); + for (Map.Entry<String, IgniteUuid> e : info.listing2().entrySet()) { + IgfsFileInfo childInfo = meta.info(e.getValue()); - files.add(new IgfsFileImpl(p, e.getValue(), data.groupBlockSize())); + if (childInfo != null) { + IgfsPath childPath = new IgfsPath(path, e.getKey()); + + files.add(new IgfsFileImpl(childPath, childInfo, data.groupBlockSize())); + } } } } else if (mode == PRIMARY) { @@ -1281,8 +1285,8 @@ public final class IgfsImpl implements IgfsEx { if (!IgfsUtils.ROOT_ID.equals(info.id())) sum.directoriesCount(sum.directoriesCount() + 1); - for (IgfsListingEntry entry : info.listing().values()) - summary0(entry.fileId(), sum); + for (IgniteUuid id : info.listing2().values()) + summary0(id, sum); } else { sum.filesCount(sum.filesCount() + 1);
