ACCUMULO-2659 Fall back to the configuration when the iterator setting aren't in the split
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/019edb16 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/019edb16 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/019edb16 Branch: refs/heads/master Commit: 019edb1614008485f523deecaef88c7455e1e404 Parents: 6fb434f Author: Josh Elser <els...@apache.org> Authored: Fri Apr 11 17:37:04 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Apr 11 17:37:31 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/mapred/InputFormatBase.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/019edb16/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java index 54b983f..0cee355 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java @@ -322,6 +322,9 @@ public abstract class InputFormatBase<K,V> extends AbstractInputFormat<K,V> { iterators = getIterators(job); } else { iterators = split.getIterators(); + if (null == iterators) { + iterators = getIterators(job); + } } setupIterators(iterators, scanner);
