From 87e4661193cb9f55ab2bf5ee469168c3fdd7037b Mon Sep 17 00:00:00 2001
From: Cowtowncoder <tatu.saloranta@iki.fi>
Date: Tue, 25 Nov 2014 14:24:36 -0800
Subject: [PATCH] Fix #635

---
 pom.xml                                       |  2 +-
 release-notes/VERSION                         |  5 +++++
 .../databind/deser/std/MapDeserializer.java   | 21 +++++++++++++------
 .../ser/impl/SimpleFilterProvider.java        |  4 ++--
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 628d00070d..5e8baa1015 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@ javax.xml.datatype, javax.xml.namespace, javax.xml.parsers
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.4.4</version>
+      <version>2.4.5-SNAPSHOT</version>
     </dependency>
 
     <!-- and for testing we need a few libraries
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 9462b7afd0..07d2fa26a9 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -4,6 +4,11 @@ Project: jackson-databind
 === Releases ===
 ------------------------------------------------------------------------
 
+2.4.5 (not yet released)
+
+#635: Reduce cachability of `Map` deserializers, to avoid problems with per-property config changes
+    (regression due to #604)
+
 2.4.4 (24-Nov-2014)
 
 (jackson-core)#158: Setter confusion on assignable types
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
index eff1945b2e..e6a9b1e67c 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
@@ -182,7 +182,7 @@ protected final boolean _isStdKeyDeser(JavaType mapType, KeyDeserializer keyDese
         return ((rawKeyType == String.class || rawKeyType == Object.class)
                 && isDefaultKeyDeserializer(keyDeser));
     }
-    
+
     public void setIgnorableProperties(String[] ignorable) {
         _ignorableProperties = (ignorable == null || ignorable.length == 0) ?
             null : ArrayBuilders.arrayToSet(ignorable);
@@ -285,11 +285,20 @@ public JsonDeserializer<Object> getContentDeserializer() {
     /**
      * Turns out that these are expensive enough to create so that caching
      * does make sense.
+     *<p>
+     * IMPORTANT: but, note, that instances CAN NOT BE CACHED if there is
+     * a value type deserializer; this caused an issue with 2.4.4 of
+     * JAXB Annotations (failing a test).
+     * It is also possible that some other settings could make deserializers
+     * un-cacheable; but on the other hand, caching can make a big positive
+     * difference with performance... so it's a hard choice.
      * 
      * @since 2.4.4
      */
     @Override
-    public boolean isCachable() { return true; }
+    public boolean isCachable() {
+        return (_valueTypeDeserializer == null) && (_ignorableProperties == null);
+    }
 
     @Override
     @SuppressWarnings("unchecked")
@@ -566,8 +575,8 @@ protected void wrapAndThrow(Throwable t, Object ref, String key) throws IOExcept
         throw JsonMappingException.wrapWithPath(t, ref, key);
     }
 
-    private void handleUnresolvedReference(JsonParser jp, MapReferringAccumulator accumulator, Object key,
-            UnresolvedForwardReference reference)
+    private void handleUnresolvedReference(JsonParser jp, MapReferringAccumulator accumulator,
+            Object key, UnresolvedForwardReference reference)
         throws JsonMappingException
     {
         if (accumulator == null) {
@@ -577,7 +586,7 @@ private void handleUnresolvedReference(JsonParser jp, MapReferringAccumulator ac
         reference.getRoid().appendReferring(referring);
     }
 
-    private final static class MapReferringAccumulator  {
+    private final static class MapReferringAccumulator {
         private final Class<?> _valueType;
         private Map<Object,Object> _result;
         /**
@@ -641,7 +650,7 @@ private final static class MapReferring extends Referring {
         public final Map<Object, Object> next = new LinkedHashMap<Object, Object>();
         public final Object key;
         
-        private MapReferring(MapReferringAccumulator parent, UnresolvedForwardReference ref,
+        protected MapReferring(MapReferringAccumulator parent, UnresolvedForwardReference ref,
                 Class<?> valueType, Object key)
         {
             super(ref, valueType);
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.java
index 29f4262e48..52f6703fbd 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.java
@@ -15,8 +15,8 @@ public class SimpleFilterProvider
     extends FilterProvider
     implements java.io.Serializable // since 2.1
 {
-    // for 2.3.0
-    private static final long serialVersionUID = -6305772546718366447L;
+    // for 2.5+
+    private static final long serialVersionUID = 1L;
 
     /**
      * Mappings from ids to filters.