Merge branch '2.10'

vi-technologies · Jul 7, 2018 · 496e591 · 496e591
2 parents d2c083a + 799da54
commit 496e591
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,6 +14,7 @@ Project: jackson-databind
 #2060: `UnwrappingBeanPropertyWriter` incorrectly assumes the found serializer is
   of type `UnwrappingBeanSerializer`
  (reported by Petar T)
+#2082: `FactoryBasedEnumDeserializer` should be cachable
 
 2.9.6 (12-Jun-2018)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/FactoryBasedEnumDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/FactoryBasedEnumDeserializer.java
@@ -95,6 +95,10 @@ public Boolean supportsUpdate(DeserializationConfig config) {
         return Boolean.FALSE;
     }
 
+    // since 2.9.7: should have been the case earlier but
+    @Override
+    public boolean isCachable() { return true; }
+
     @Override
     public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException
     {