Merge branch '2.7' into 2.8

Author: cowtowncoder

release-notes/VERSION

@@ -37,6 +37,7 @@ Project: jackson-databind
  (reported by Jörn H)
 #1432: Off by 1 bug in PropertyValueBuffer
  (reported by Kevin D)
+#1439: NPE when using with filter id, serializing `java.util.Map` types
 
 2.8.3 (17-Sep-2016)
 

src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java

@@ -525,9 +525,9 @@ public void serialize(Map<?,?> value, JsonGenerator gen, SerializerProvider prov
             if (_sortKeys || provider.isEnabled(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)) {
                 value = _orderEntries(value, gen, provider, suppressableValue);
             }
-            if (_filterId != null) {
-                serializeFilteredFields(value, gen, provider,
-                        findPropertyFilter(provider, _filterId, value), suppressableValue);
+            PropertyFilter pf;
+            if ((_filterId != null) && (pf = findPropertyFilter(provider, _filterId, value)) != null) {
+                serializeFilteredFields(value, gen, provider, pf, suppressableValue);
             } else if (suppressableValue != null) {
                 serializeOptionalFields(value, gen, provider, suppressableValue);
             } else if (_valueSerializer != null) {
@@ -559,9 +559,9 @@ public void serializeWithType(Map<?,?> value, JsonGenerator gen, SerializerProvi
             if (_sortKeys || provider.isEnabled(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)) {
                 value = _orderEntries(value, gen, provider, suppressableValue);
             }
-            if (_filterId != null) {
-                serializeFilteredFields(value, gen, provider,
-                        findPropertyFilter(provider, _filterId, value), suppressableValue);
+            PropertyFilter pf;
+            if ((_filterId != null) && (pf = findPropertyFilter(provider, _filterId, value)) != null) {
+                serializeFilteredFields(value, gen, provider, pf, suppressableValue);
             } else if (suppressableValue != null) {
                 serializeOptionalFields(value, gen, provider, suppressableValue);
             } else if (_valueSerializer != null) {