ACCUMULO-4057 Moved the code to a private static method, and the methods now call the new one
Signed-off-by: Josh Elser <els...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/003fd3f9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/003fd3f9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/003fd3f9 Branch: refs/heads/master Commit: 003fd3f924b6db51e75b511c8374899a11db8d63 Parents: f813d3b Author: Luis Tavarez <zera...@outlook.com> Authored: Thu Dec 29 10:54:08 2016 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Jan 4 12:34:31 2017 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/iterators/IteratorUtil.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/003fd3f9/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java index 3f23fd2..afe9349 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java @@ -235,15 +235,21 @@ public class IteratorUtil { public static <K extends WritableComparable<?>,V extends Writable> SortedKeyValueIterator<K,V> loadIterators(IteratorScope scope, SortedKeyValueIterator<K,V> source, KeyExtent extent, AccumuloConfiguration conf, List<IterInfo> ssiList, Map<String,Map<String,String>> ssio, IteratorEnvironment env, boolean useAccumuloClassLoader) throws IOException { - List<IterInfo> iters = new ArrayList<>(ssiList); - Map<String,Map<String,String>> allOptions = new HashMap<>(); - parseIteratorConfiguration(scope, iters, ssio, allOptions, conf); - return loadIterators(source, iters, allOptions, env, useAccumuloClassLoader, conf.get(Property.TABLE_CLASSPATH)); + + return loadIteratorsHelper(scope, source, extent, conf, ssiList, ssio, env, useAccumuloClassLoader, conf.get(Property.TABLE_CLASSPATH)); } public static <K extends WritableComparable<?>,V extends Writable> SortedKeyValueIterator<K,V> loadIterators(IteratorScope scope, SortedKeyValueIterator<K,V> source, KeyExtent extent, AccumuloConfiguration conf, List<IterInfo> ssiList, Map<String,Map<String,String>> ssio, IteratorEnvironment env, boolean useAccumuloClassLoader, String classLoaderContext) throws IOException { + + return loadIteratorsHelper(scope, source, extent, conf, ssiList, ssio, env, useAccumuloClassLoader, classLoaderContext); + } + + private static <K extends WritableComparable<?>,V extends Writable> SortedKeyValueIterator<K,V> loadIteratorsHelper(IteratorScope scope, + SortedKeyValueIterator<K,V> source, KeyExtent extent, AccumuloConfiguration conf, List<IterInfo> ssiList, Map<String,Map<String,String>> ssio, + IteratorEnvironment env, boolean useAccumuloClassLoader, String classLoaderContext) throws IOException { + List<IterInfo> iters = new ArrayList<>(ssiList); Map<String,Map<String,String>> allOptions = new HashMap<>(); parseIteratorConfiguration(scope, iters, ssio, allOptions, conf);
