validation fails with IllegalState instead of of NPE

samtools · Aug 1, 2019 · 1cc3341 · 1cc3341
1 parent 40036be
commit 1cc3341
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/main/java/htsjdk/variant/variantcontext/VariantContextBuilder.java b/src/main/java/htsjdk/variant/variantcontext/VariantContextBuilder.java
@@ -397,10 +397,13 @@ private void filtersAsIs(final Set<String> filters) {
     /**
      * {@link #filters}
      *
-     * @param filters  Set of strings to set as the filters for this builder
+     * @param filters  Strings to set as the filters for this builder
      * @return this builder
      */
     public VariantContextBuilder filters(final String ... filters) {
+        if(filters == null){
+            this.unfiltered();
+        }
         filtersAsIs(new LinkedHashSet<>(Arrays.asList(filters)));
         return this;
     }

diff --git a/src/test/java/htsjdk/variant/variantcontext/VariantContextBuilderTest.java b/src/test/java/htsjdk/variant/variantcontext/VariantContextBuilderTest.java
@@ -329,6 +329,19 @@ public void testCantCreateNullFilter(){
         builder.filters((String)null);
         builder.make();
     }
-
+
+    @Test
+    public void testNullFilterArray(){
+        final VariantContextBuilder builder = new VariantContextBuilder("source", "contig", 1, 1, Arrays.asList(Tref, C, G)).filter("TEST");
+        builder.filters((String[])null);
+    }
+
+    @Test
+    public void testNullFilterSet(){
+        final VariantContextBuilder builder = new VariantContextBuilder("source", "contig", 1, 1, Arrays.asList(Tref, C, G)).filter("TEST");
+        builder.filters((Set<String>)null);
+        builder.make();
+    }
+
 
 }