Merge pull request #16 from ninian/master

Applying suggested fix for JENKINS-25964
jenkinsci · Mar 29, 2015 · 0aadd9e · 0aadd9e
2 parents e454609 + 5ef829b
commit 0aadd9e
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/configurationslicing/UnorderedStringSlice.java b/src/main/java/configurationslicing/UnorderedStringSlice.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Logger;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -22,7 +23,10 @@
 import configurationslicing.UnorderedStringSlicer.UnorderedStringSlicerSpec;
 
 public class UnorderedStringSlice<I> extends Slice {
+
+    private static final Logger LOGGER = Logger.getLogger(UnorderedStringSlice.class.getName());
     private Map<String, List<String>> nameToValues;
+
     private Map<String, Set<String>> valueToNames;
     private UnorderedStringSlicer.UnorderedStringSlicerSpec<I> spec;
 
@@ -75,6 +79,11 @@ public void add(String name, Collection<String> values) {
     }
 
     private static void addLineWithSets(Map<String, Set<String>> map, String s, String name) {
+        if (null == s) {
+            LOGGER.severe("found illegal line with null value for name: "+name);
+            // do nothing
+            return;
+        }
         if(!map.containsKey(s)) {
             map.put(s, new HashSet<String>());
         }