Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 715A311185 for ; Fri, 11 Apr 2014 21:46:46 +0000 (UTC) Received: (qmail 37855 invoked by uid 500); 11 Apr 2014 21:46:44 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 37731 invoked by uid 500); 11 Apr 2014 21:46:43 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 37688 invoked by uid 99); 11 Apr 2014 21:46:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Apr 2014 21:46:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D2D1898B834; Fri, 11 Apr 2014 21:46:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 11 Apr 2014 21:46:43 -0000 Message-Id: <516a12595e55465a9703a32e694af6c4@git.apache.org> In-Reply-To: <03733431eb7840b588c562dce3a7ee91@git.apache.org> References: <03733431eb7840b588c562dce3a7ee91@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: ACCUMULO-2659 Fall back to the configuration when the iterator setting aren't in the split 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/1.6.0-SNAPSHOT Commit: 019edb1614008485f523deecaef88c7455e1e404 Parents: 6fb434f Author: Josh Elser Authored: Fri Apr 11 17:37:04 2014 -0400 Committer: Josh Elser 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 extends AbstractInputFormat { iterators = getIterators(job); } else { iterators = split.getIterators(); + if (null == iterators) { + iterators = getIterators(job); + } } setupIterators(iterators, scanner);