aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTatu Saloranta <tatu.saloranta@iki.fi>2020-04-16 14:35:06 -0700
committerTatu Saloranta <tatu.saloranta@iki.fi>2020-04-16 14:35:06 -0700
commitaaa19f4d687afed2347cbe1e9095f3ac2a4b87eb (patch)
treef2e67078da59bc374a9e641157022dd05abf9d37 /src/main
parent20443e22a9a24907484aa1cd2d6843cdcfef3977 (diff)
downloadjackson-databind-aaa19f4d687afed2347cbe1e9095f3ac2a4b87eb.tar.gz
...
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java b/src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java
index 89d18f9c6..747aeccb5 100644
--- a/src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java
+++ b/src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java
@@ -434,7 +434,9 @@ public class JacksonAnnotationIntrospector
@Override
public JsonFormat.Value findFormat(Annotated ann) {
JsonFormat f = _findAnnotation(ann, JsonFormat.class);
- return (f == null) ? null : new JsonFormat.Value(f);
+ // NOTE: could also just call `JsonFormat.Value.from()` with `null`
+ // too, but that returns "empty" instance
+ return (f == null) ? null : JsonFormat.Value.from(f);
}
@Override