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 2017/08/14 10:30:28 UTC

[18/50] ignite git commit: Minors.

Minors.


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

Branch: refs/heads/ignite-5991-6019
Commit: 652713cba2498cfa85ad89bf9f0aaf96784cae76
Parents: 51a6213
Author: Alexander Paschenko <al...@gmail.com>
Authored: Thu Aug 10 17:19:08 2017 +0300
Committer: Alexander Paschenko <al...@gmail.com>
Committed: Thu Aug 10 17:19:08 2017 +0300

----------------------------------------------------------------------
 .../processors/query/h2/twostep/GridMergeIndexesIterator.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/652713cb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexesIterator.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexesIterator.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexesIterator.java
index 5958689..9a13d49 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexesIterator.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexesIterator.java
@@ -105,10 +105,12 @@ class GridMergeIndexesIterator extends GridCloseableIteratorAdapterEx<List<?>> {
 
                 int cols = row.getColumnCount();
 
-                next = new ArrayList<>(cols);
+                List<Object> res = new ArrayList<>(cols);
 
                 for (int c = 0; c < cols; c++)
-                    next.add(row.getValue(c).getObject());
+                    res.add(row.getValue(c).getObject());
+
+                next = res;
             }
         }
         catch (Throwable e) {