Merge pull request #693 from chonton/master

fix empty link causing NullPointerException
fabric8io · Jan 24, 2017 · d4b624d · d4b624d
2 parents 6a707c6 + 0faafbb
commit d4b624d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/main/java/io/fabric8/maven/docker/util/EnvUtil.java b/src/main/java/io/fabric8/maven/docker/util/EnvUtil.java
@@ -12,6 +12,7 @@
 import org.apache.maven.shared.utils.io.FileUtils;
 
 import com.google.common.base.Function;
+import com.google.common.base.Predicates;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -127,7 +128,8 @@ public static List<String> splitAtCommasAndTrim(Iterable<String> input) {
  if(input==null) {
  return Collections.emptyList();
  }
- return Lists.newArrayList(Iterables.concat(Iterables.transform(input, COMMA_SPLITTER)));
+ Iterable<String> nonEmptyInputs = Iterables.filter(input, Predicates.notNull());
+ return Lists.newArrayList(Iterables.concat(Iterables.transform(nonEmptyInputs, COMMA_SPLITTER)));
  }
 
  public static String[] splitOnSpaceWithEscape(String toSplit) {

diff --git a/src/test/java/io/fabric8/maven/docker/util/EnvUtilTest.java b/src/test/java/io/fabric8/maven/docker/util/EnvUtilTest.java
@@ -45,6 +45,30 @@ public void splitAtCommas() {
  assertTrue(Iterables.elementsEqual(it, expected));
  }
 
+ public void assertEmptyList(Iterable<String> actual) {
+ assertTrue(Iterables.elementsEqual(Collections.emptyList(), actual));
+ }
+ @Test
+ public void splitAtCommasEmpty() {
+ assertEmptyList(EnvUtil.splitAtCommasAndTrim(Collections.<String>emptyList()));
+ }
+
+ @Test
+ public void splitAtCommasSingleEmpty() {
+ assertEmptyList(EnvUtil.splitAtCommasAndTrim(Arrays.asList("")));
+ }
+
+ @Test
+ public void splitAtCommasNullList() {
+ assertEmptyList(EnvUtil.splitAtCommasAndTrim(null));
+ }
+
+ // null occurs when <links><link></link></links>
+ @Test
+ public void splitAtCommasNullInList() {
+ assertEmptyList(EnvUtil.splitAtCommasAndTrim(Collections.<String>singletonList(null)));
+ }
+
  @Test
  @TestCaseName("{method}: input \"{0}\" splits to {1}")
  @Parameters