Merge c258e6a5c5 into 45333e0a31

json-path/src/main/java/com/jayway/jsonpath/JsonPath.java

@@ -168,7 +168,7 @@ public class JsonPath {
         boolean optAsPathList = configuration.containsOption(AS_PATH_LIST);
         boolean optAlwaysReturnList = configuration.containsOption(Option.ALWAYS_RETURN_LIST);
         boolean optSuppressExceptions = configuration.containsOption(Option.SUPPRESS_EXCEPTIONS);
-
+        try {
             if (path.isFunctionPath()) {
                 if (optAsPathList || optAlwaysReturnList) {
                     if (optSuppressExceptions) {
@@ -205,6 +205,12 @@ public class JsonPath {
                     return (T) res;
                 }
             }
+        } catch (JsonPathException ex) {
+            if (optSuppressExceptions) {
+                return (T) configuration.jsonProvider().createArray();
+            }
+            throw ex;
+        }
     }
 
     /**

json-path/src/test/java/com/jayway/jsonpath/Issue_908.java

@@ -0,0 +1,25 @@
+package com.jayway.jsonpath;
+
+import org.junit.Test;
+
+public class Issue_908 {
+
+  @Test(expected = InvalidPathException.class)
+  public void test_when_current_context_is_null() {
+    JsonPath
+        .parse("{\"test\" : null }")
+        .read("$.test[?(@ != null)]");
+  }
+
+  @Test
+  public void test_suppress_exception_when_current_context_is_null() {
+
+    Object rs = JsonPath.using(Configuration.builder()
+            .options(Option.SUPPRESS_EXCEPTIONS).build())
+        .parse("{\"test\" : null }")
+        .read("$.test[?(@ != null)]");
+   
+    assert(rs.toString().equals("[]"));
+  }
+
+}