Repository: phoenix Updated Branches: refs/heads/master 1f942b1f0 -> 4859fb9d6
PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4859fb9d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4859fb9d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4859fb9d Branch: refs/heads/master Commit: 4859fb9d66ccdeb4224bf7d52895368d9592d5fa Parents: 1f942b1 Author: Samarth <samarth.j...@salesforce.com> Authored: Thu Apr 2 16:26:50 2015 -0700 Committer: Samarth <samarth.j...@salesforce.com> Committed: Thu Apr 2 16:26:50 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4859fb9d/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java index a120143..9ac6a29 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java @@ -556,7 +556,7 @@ public abstract class BaseResultIterators extends ExplainTable implements Result // Add any concatIterators that were successful so far // as we need these to be in order addIterator(iterators, concatIterators); - concatIterators = Collections.emptyList(); + concatIterators = Lists.newArrayList(); submitWork(newNestedScans, newFutures, allIterators, newNestedScans.size()); allFutures.add(newFutures); for (List<Pair<Scan,Future<PeekingResultIterator>>> newFuture : reverseIfNecessary(newFutures, isReverse)) {
