commit 32224282e4a0862778e9ed139c0900ffb2d06c6a
author Cowtowncoder <tatu.saloranta@iki.fi> Thu Apr 16 16:39:22 2015 -0700
committer Cowtowncoder <tatu.saloranta@iki.fi> Thu Apr 16 16:39:22 2015 -0700
tree c0a0c6eda6518bd28ea0bb25c6b6e9949d3b65e3
parent df5215700ab69512eddbc4151d36a2001d500104

Further fixes to parser filtering

src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java

diff --git a/src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java b/src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java
index a3194c3..98a507e 100644
--- a/src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java
+++ b/src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java
@@ -373,9 +373,17 @@
             }
 
         default: // scalar value
-            if (_itemFilter == TokenFilter.INCLUDE_ALL) {
+            f = _itemFilter;
+            if (f == TokenFilter.INCLUDE_ALL) {
                 return (_currToken = t);
             }
+            if (f != null) {
+                f = _headContext.checkValue(f);
+                if ((f == TokenFilter.INCLUDE_ALL)
+                        || ((f != null) && f.includeValue(delegate))) {
+                    return (_currToken = t);
+                }
+            }
             // Otherwise not included (leaves must be explicitly included)
             break;
         }
@@ -509,12 +517,18 @@
 
             default: // scalar value
                 f = _itemFilter;
-                if ((f == TokenFilter.INCLUDE_ALL)
-                        || ((f != null) && f.includeValue(delegate))) {
+                if (f == TokenFilter.INCLUDE_ALL) {
                     return (_currToken = t);
                 }
+                if (f != null) {
+                    f = _headContext.checkValue(f);
+                    if ((f == TokenFilter.INCLUDE_ALL)
+                            || ((f != null) && f.includeValue(delegate))) {
+                        return (_currToken = t);
+                    }
+                }
                 // Otherwise not included (leaves must be explicitly included)
-                continue main_loop;
+                break;
             }
         }
     }
@@ -630,10 +644,19 @@
                 continue main_loop;
 
             default: // scalar value
-                if (_itemFilter == TokenFilter.INCLUDE_ALL) {
+                f = _itemFilter;
+                if (f == TokenFilter.INCLUDE_ALL) {
                     return _nextBuffered();
                 }
+                if (f != null) {
+                    f = _headContext.checkValue(f);
+                    if ((f == TokenFilter.INCLUDE_ALL)
+                            || ((f != null) && f.includeValue(delegate))) {
+                        return _nextBuffered();
+                    }
+                }
                 // Otherwise not included (leaves must be explicitly included)
+                continue main_loop;
             }
         }
     }