fixed null collections

brianmhess · Oct 9, 2015 · 4e8135d · 4e8135d
1 parent f79d821
commit 4e8135d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/com/datastax/loader/parser/ListParser.java b/src/main/java/com/datastax/loader/parser/ListParser.java
@@ -46,6 +46,8 @@ public ListParser(Parser inParser, char inCollectionDelim,
     }
 
     public Object parse(String toparse) throws ParseException {
+	if (null == toparse)
+	    return null;
 	if (!toparse.startsWith(Character.toString(collectionBegin)))
 	    throw new ParseException("Must begin with " + collectionBegin 
 				     + "\n", 0);

diff --git a/src/main/java/com/datastax/loader/parser/MapParser.java b/src/main/java/com/datastax/loader/parser/MapParser.java
@@ -52,6 +52,8 @@ public MapParser(Parser inKeyParser, Parser inValueParser,
 	elements = new HashMap<Object,Object>();
     }
     public Object parse(String toparse) throws ParseException {
+	if (null == toparse)
+	    return null;
 	if (!toparse.startsWith(Character.toString(collectionBegin)))
 	    throw new ParseException("Must begin with " + collectionBegin 
 				     + "\n", 0);

diff --git a/src/main/java/com/datastax/loader/parser/SetParser.java b/src/main/java/com/datastax/loader/parser/SetParser.java
@@ -46,6 +46,8 @@ public SetParser(Parser inParser, char inCollectionDelim,
 	elements = new HashSet<Object>();
     }
     public Object parse(String toparse) throws ParseException {
+	if (null == toparse)
+	    return null;
 	if (!toparse.startsWith(Character.toString(collectionBegin)))
 	    throw new ParseException("Must begin with " + collectionBegin 
 				     + "\n", 0);