fix null pointer exception for hasValue in a repeating group when the…

…re is no value
LMAX-Exchange · Feb 3, 2023 · 200a45d · 200a45d
1 parent def9e9e
commit 200a45d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/com/lmax/simpledsl/internal/RepeatingParamValues.java b/src/main/java/com/lmax/simpledsl/internal/RepeatingParamValues.java
@@ -22,7 +22,8 @@ class RepeatingParamValues implements RepeatingGroup
     @Override
     public boolean hasValue(final String name)
     {
-        return !getValues(name).isEmpty();
+        final List<String> values = getValues(name);
+        return !(values == null || values.isEmpty());
 
     }
 

diff --git a/src/test/java/com/lmax/simpledsl/internal/RepeatingParamValuesTest.java b/src/test/java/com/lmax/simpledsl/internal/RepeatingParamValuesTest.java
@@ -27,7 +27,6 @@
 import java.util.Map;
 
 import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -113,7 +112,6 @@ public void shouldNotReportOptionalValueAsPresentWhenNoValueProvided()
         final OptionalArg otherArg = new OptionalArg("bar");
         final Map<String, List<String>> values = new HashMap<>();
         values.put("foo", Collections.singletonList("abc"));
-        values.put("bar", emptyList());
         final RepeatingParamValues params = new RepeatingParamValues(asList(requiredArg, otherArg).toArray(new DslArg[0]), values);
 
         assertFalse(params.hasValue("bar"));