diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/JsonContext.java b/json-path/src/main/java/com/jayway/jsonpath/internal/JsonContext.java index 6f2706b1..5cc0889c 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/internal/JsonContext.java +++ b/json-path/src/main/java/com/jayway/jsonpath/internal/JsonContext.java @@ -26,7 +26,6 @@ import com.jayway.jsonpath.ReadContext; import com.jayway.jsonpath.TypeRef; import com.jayway.jsonpath.spi.cache.Cache; import com.jayway.jsonpath.spi.cache.CacheProvider; -import com.jayway.jsonpath.spi.cache.LRUCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java index 1215f434..fe97628c 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java +++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java @@ -49,10 +49,10 @@ public abstract class AbstractAggregation implements PathFunction { } if (parameters != null) { for (Parameter param : parameters) { - if (param.getValue() instanceof Number) { - Number value = (Number)param.getValue(); + Object value = param.getValue(); + if (null != value && value instanceof Number) { count++; - next(value); + next((Number)value); } } }