semantic of PathToken.isUpstreamDefinite changed: current token is not an upstream of itself

json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java

@@ -43,6 +43,10 @@ public abstract class PathToken {
             String evalPath = Utils.concat(currentPath, "['", property, "']");
             Object propertyVal = readObjectProperty(property, model, ctx);
             if(propertyVal == JsonProvider.UNDEFINED){
+                // Conditions below heavily depend on current token type (and its logic) and are not "universal",
+                // so this code is quite dangerous. Better safe than sorry.
+                assert this instanceof PropertyPathToken : "only PropertyPathToken is supported";
+
                 if(isLeaf()) {
                     if(ctx.options().contains(Option.DEFAULT_PATH_LEAF_TO_NULL)){
                         propertyVal =  null;
@@ -148,16 +152,11 @@ public abstract class PathToken {
         return  prev == null;
     }
 
-    public boolean isUpstreamDefinite(){
+    public boolean isUpstreamDefinite() {
-        if(upstreamDefinite != null){
+        if (upstreamDefinite == null) {
-            return upstreamDefinite.booleanValue();
+            upstreamDefinite = isRoot() || prev.isTokenDefinite() && prev.isUpstreamDefinite();
-        }
-        boolean isUpstreamDefinite = isTokenDefinite();
-        if (isUpstreamDefinite && !isRoot()) {
-            isUpstreamDefinite = prev.isUpstreamDefinite();
         }
-        upstreamDefinite = isUpstreamDefinite;
+        return upstreamDefinite;
-        return isUpstreamDefinite;
     }
 
     public int getTokenCount() {

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

@@ -30,7 +30,7 @@ public class PathTokenTest extends BaseTest {
     public void is_upstream_definite_in_complex_case() {
         assertThat(makePathReturningTail(makePPT("foo"), makePPT("bar"), makePPT("baz")).isUpstreamDefinite()).isTrue();
 
-        assertThat(makePathReturningTail(makePPT("foo"), new WildcardPathToken()).isUpstreamDefinite()).isFalse();
+        assertThat(makePathReturningTail(makePPT("foo"), new WildcardPathToken()).isUpstreamDefinite()).isTrue();
 
         assertThat(makePathReturningTail(new WildcardPathToken(), makePPT("bar"), makePPT("baz")).isUpstreamDefinite()).isFalse();
     }