Merge branch '2.9' into 2.10

cowtowncoder · cowtowncoder · commit 799da54e0d6b · 2018-07-06T17:04:53.000-07:00
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
@@ -99,6 +99,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
     {

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,10 @@ public Boolean supportsUpdate(DeserializationConfig config) {`
`99`	`99`	`return Boolean.FALSE;`
`100`	`100`	`}`
`101`	`101`
	`102`	`+ // since 2.9.7: should have been the case earlier but`
	`103`	`+ @Override`
	`104`	`+ public boolean isCachable() { return true; }`
	`105`	`+`
`102`	`106`	`@Override`
`103`	`107`	`public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException`
`104`	`108`	`{`