diff --git a/ivy.xml b/ivy.xml index 9cc92d890..f76880b94 100644 --- a/ivy.xml +++ b/ivy.xml @@ -59,7 +59,7 @@ - + diff --git a/public/java/src/org/broadinstitute/sting/utils/variantcontext/VariantContextUtils.java b/public/java/src/org/broadinstitute/sting/utils/variantcontext/VariantContextUtils.java index 099c3d541..e2c30913f 100755 --- a/public/java/src/org/broadinstitute/sting/utils/variantcontext/VariantContextUtils.java +++ b/public/java/src/org/broadinstitute/sting/utils/variantcontext/VariantContextUtils.java @@ -52,8 +52,9 @@ public class VariantContextUtils { private final static boolean ASSUME_MISSING_FIELDS_ARE_STRINGS = false; static { - engine.setSilent(false); // will throw errors now for selects that don't evaluate properly - engine.setLenient(false); + engine.setSilent(true); // will throw errors now for selects that don't evaluate properly + engine.setLenient(true); + engine.setDebug(false); } /** diff --git a/public/java/src/org/broadinstitute/sting/utils/variantcontext/VariantJEXLContext.java b/public/java/src/org/broadinstitute/sting/utils/variantcontext/VariantJEXLContext.java index 6ecb898df..e25599812 100644 --- a/public/java/src/org/broadinstitute/sting/utils/variantcontext/VariantJEXLContext.java +++ b/public/java/src/org/broadinstitute/sting/utils/variantcontext/VariantJEXLContext.java @@ -264,7 +264,9 @@ class JEXLMap implements Map { // if the context is null, we need to create it to evaluate the JEXL expression if (this.jContext == null) createContext(); try { - jexl.put (exp, (Boolean) exp.exp.evaluate(jContext)); + final Boolean value = (Boolean) exp.exp.evaluate(jContext); + // treat errors as no match + jexl.put(exp, value == null ? false : value); } catch (Exception e) { throw new UserException.CommandLineException(String.format("Invalid JEXL expression detected for %s with message %s", exp.name, e.getMessage())); }