Minor improvement to handling of JsonFormat.Value with AnnotationIntr…

…ospectorPair, should try merging
FasterXML · Nov 28, 2015 · 7e5f014 · 7e5f014
1 parent 3c35f1c
commit 7e5f014
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 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
@@ -404,11 +404,15 @@ public ObjectIdInfo findObjectReferenceInfo(Annotated ann, ObjectIdInfo objectId
         objectIdInfo = _primary.findObjectReferenceInfo(ann, objectIdInfo);
         return objectIdInfo;
     }
-    
+
     @Override
     public JsonFormat.Value findFormat(Annotated ann) {
-        JsonFormat.Value r = _primary.findFormat(ann);
-        return (r == null) ? _secondary.findFormat(ann) : r;
+        JsonFormat.Value v1 = _primary.findFormat(ann);
+        JsonFormat.Value v2 = _secondary.findFormat(ann);
+        if (v2 == null) { // shouldn't occur but just in case
+            return v1;
+        }
+        return v2.withOverrides(v1);
     }
 
     @Override

diff --git a/src/test/java/com/fasterxml/jackson/databind/type/PolymorphicList036Test.java b/src/test/java/com/fasterxml/jackson/databind/type/PolymorphicList036Test.java
@@ -99,10 +99,11 @@ public void testPolymorphicWithOverride() throws Exception
         list.add("value 2");
 
         String serialized = MAPPER.writeValueAsString(list);
-        System.out.println(serialized);
+//        System.out.println(serialized);
 
         StringyList<String> deserialized = MAPPER.readValue(serialized, type);
-        System.out.println(deserialized);
+//        System.out.println(deserialized);
 
+        assertNotNull(deserialized);
     }
 }