You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/09/13 09:53:47 UTC
[55/69] [abbrv] ignite git commit: IGNITE-3857: IGFS: Support direct
PROXY mode invocation in methods: listPaths / listFiles. This closes #1048.
IGNITE-3857: IGFS: Support direct PROXY mode invocation in methods: listPaths / listFiles. This closes #1048.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1cc502d6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1cc502d6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1cc502d6
Branch: refs/heads/ignite-3199-1
Commit: 1cc502d64ca058d97b071f7db0ee18f3aac3dfd7
Parents: cc59502
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Thu Sep 8 15:17:26 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 8 15:17:26 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/processors/igfs/IgfsImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1cc502d6/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 a6d5b77..636b4a9 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
@@ -840,7 +840,7 @@ public final class IgfsImpl implements IgfsEx {
Collection<IgfsPath> files = new HashSet<>();
- if (IgfsUtils.isDualMode(mode)) {
+ if (mode != PRIMARY) {
assert secondaryFs != null;
try {
@@ -848,7 +848,7 @@ public final class IgfsImpl implements IgfsEx {
files.addAll(children);
- if (!modeRslvr.hasPrimaryChild(path))
+ if (mode == PROXY || !modeRslvr.hasPrimaryChild(path))
return files;
}
catch (Exception e) {
@@ -889,7 +889,7 @@ public final class IgfsImpl implements IgfsEx {
Collection<IgfsFile> files = new HashSet<>();
- if (IgfsUtils.isDualMode(mode)) {
+ if (mode != PRIMARY) {
assert secondaryFs != null;
try {
@@ -901,7 +901,7 @@ public final class IgfsImpl implements IgfsEx {
files.add(impl);
}
- if (!modeRslvr.hasPrimaryChild(path))
+ if (mode == PROXY || !modeRslvr.hasPrimaryChild(path))
return files;
}
catch (Exception e) {