aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java')
-rw-r--r--src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java
index 3ba0ab9a5..944bce7fa 100644
--- a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java
+++ b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java
@@ -127,10 +127,10 @@ public class AnnotationIntrospectorPair
}
@Override
- public JsonIncludeProperties.Value findPropertyInclusions(Annotated a)
+ public JsonIncludeProperties.Value findPropertyInclusions(MapperConfig<?> config, Annotated a)
{
- JsonIncludeProperties.Value v2 = _secondary.findPropertyInclusions(a);
- JsonIncludeProperties.Value v1 = _primary.findPropertyInclusions(a);
+ JsonIncludeProperties.Value v2 = _secondary.findPropertyInclusions(config, a);
+ JsonIncludeProperties.Value v1 = _primary.findPropertyInclusions(config, a);
return (v2 == null) // shouldn't occur but
? v1 : v2.withOverrides(v1);
}