[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[ecn]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
        
core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/99ebfc7f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/99ebfc7f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/99ebfc7f

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 99ebfc7fcb1912488518d36b44a3c85e804f4a25
Parents: 383bf6d 13eb19c
Author: Eric Newton <eric.new...@gmail.com>
Authored: Wed Jan 22 14:03:05 2014 -0500
Committer: Eric Newton <eric.new...@gmail.com>
Committed: Wed Jan 22 14:03:05 2014 -0500

----------------------------------------------------------------------
 .../mapreduce/lib/util/InputConfigurator.java       | 11 +++++++++--
 .../client/mapreduce/AccumuloInputFormatTest.java   | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/99ebfc7f/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
----------------------------------------------------------------------
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
index 7b17d11,b0e649b..e31a265
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
@@@ -293,9 -237,16 +293,16 @@@ public class InputConfigurator extends 
     * @see #fetchColumns(Class, Configuration, Collection)
     */
    public static Set<Pair<Text,Text>> getFetchedColumns(Class<?> 
implementingClass, Configuration conf) {
 -    ArgumentChecker.notNull(conf);
 +    notNull(conf);
- 
-     return 
deserializeFetchedColumns(conf.getStringCollection(enumToConfKey(implementingClass,
 ScanOpts.COLUMNS)));
+     String confValue = conf.get(enumToConfKey(implementingClass, 
ScanOpts.COLUMNS));
+     List<String> serialized = new ArrayList<String>();
+     if (confValue != null) {
+       // Split and include any trailing empty strings to allow empty column 
families
+       for (String val : confValue.split(",", -1)) {
+         serialized.add(val);
+       }
+     }
+     return deserializeFetchedColumns(serialized);
    }
  
    public static Set<Pair<Text,Text>> 
deserializeFetchedColumns(Collection<String> serialized) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/99ebfc7f/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
----------------------------------------------------------------------