Fixing a bug with multiple json objects being sent to the parser in series

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

@@ -58,16 +58,18 @@ public class TokenStack
         assert(callback != null);
 
         boolean needsPathCheck = false;
+        /*
         if (null == curr && elements.empty()) {
             // check for $ patterns
             for (Path path : paths) {
                 if (path.checkForMatch(this)) {
-                    //if (saveMatch) matchedPaths.put(curr, path);
+                    matchedPaths.put(curr, path);
                     callback.resultFound(path);
                     rootMatch = path;
                 }
             }
         }
+        */
         while (parser.nextToken() != null) {
             boolean saveMatch = false;
             switch (parser.getCurrentToken()) {
@@ -100,7 +102,6 @@ public class TokenStack
             case START_OBJECT:
             {
                 if (curr != null && curr.getType() == TokenType.ARRAY_TOKEN) {
-
                     if (((ArrayToken)curr).getValue() != null &&
                         matchedPaths.containsKey(curr))
                     {
@@ -113,6 +114,15 @@ public class TokenStack
                             callback.resultFound(match);
                         }
                     }
+                } else if (null == curr && elements.empty()) {
+                    // check for $ patterns
+                    for (Path path : paths) {
+                        if (path.checkForMatch(this)) {
+                            matchedPaths.put(curr, path);
+                            callback.resultFound(path);
+                            rootMatch = path;
+                        }
+                    }
                 }
 
                 if (curr != null) {
@@ -129,9 +139,16 @@ public class TokenStack
             }
             case END_OBJECT:
             {
-                Path match = matchedPaths.remove(curr);
+                if (!"$".equals(curr)) {
-                if (match != null) {
+                    Path match = matchedPaths.remove(curr);
-                    callback.resultFoundExit(match);
+                    if (match != null) {
+                        callback.resultFoundExit(match);
+                    }
+                } else {
+                    Path match = matchedPaths.get("$");
+                    if (match != null) {
+                        callback.resultFoundExit(match);
+                    }
                 }
                 elements.pop();
                 if (elements.empty()) curr = null;

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

@@ -31,6 +31,10 @@ public class CallbackRecorder implements EvaluationCallback {
             }
             return false;
         }
+
+        public String toString() {
+            return path + " isexit=" + exit;
+        }
     }
 
     private List<CallbackEvent> results;