You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/16 11:26:30 UTC

[34/51] [abbrv] incubator-ignite git commit: ignite-mys-26: fixed queries on local nodes when keepPortable is set

ignite-mys-26: fixed queries on local nodes when keepPortable is set


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/322e5df8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/322e5df8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/322e5df8

Branch: refs/heads/ignite-961
Commit: 322e5df8e28b5b1d36bf04afc25fd5845f3115b7
Parents: b19ed0c
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jul 14 17:45:53 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jul 14 17:45:53 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/query/GridQueryProcessor.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/322e5df8/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 6af0f40..1ba1fae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -737,6 +737,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
             throw new IllegalStateException("Failed to execute query (grid is stopping).");
 
         try {
+            final boolean keepPortable = cctx.keepPortable();
+
             return executeQuery(cctx, new IgniteOutClosureX<QueryCursor<List<?>>>() {
                 @Override public QueryCursor<List<?>> applyx() throws IgniteCheckedException {
                     String space = cctx.name();
@@ -750,7 +752,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
 
                     QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>(new Iterable<List<?>>() {
                         @Override public Iterator<List<?>> iterator() {
-                            return new GridQueryCacheObjectsIterator(res.iterator(), cctx, cctx.keepPortable());
+                            return new GridQueryCacheObjectsIterator(res.iterator(), cctx, keepPortable);
                         }
                     });