Update release notes wrt #826, change default settings of concurrent map

Author: cowtowncoder

release-notes/CREDITS

@@ -285,3 +285,7 @@ Jeff Schnitzer (stickfigure@github)
   * Suggested #504: Add `DeserializationFeature.USE_LONG_FOR_INTS`
    (2.6.0)
 
+Lars Pfannenschmidt (larsp@github)
+  * Contributed #826: Replaced synchronized HashMap with ConcurrentHashMap in
+   TypeDeserializerBase._findDeserializer
+   (2.6.0)

release-notes/VERSION

@@ -67,6 +67,8 @@ Project: jackson-databind
   read-only/write-only use cases
 #824: Contextual `TimeZone` changes don't take effect wrt `java.util.Date`,
   `java.util.Calendar` serialization
+#826: Replaced synchronized HashMap with ConcurrentHashMap in TypeDeserializerBase._findDeserializer
+ (contributed by Lars P)
 - Remove old cglib compatibility tests; cause problems in Eclipse
 
 2.5.4 (not yet released)

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/TypeDeserializerBase.java

@@ -65,15 +65,16 @@ public abstract class TypeDeserializerBase
     /* Life-cycle
     /**********************************************************
      */
-    
+
     protected TypeDeserializerBase(JavaType baseType, TypeIdResolver idRes,
             String typePropertyName, boolean typeIdVisible, Class<?> defaultImpl)
     {
         _baseType = baseType;
         _idResolver = idRes;
         _typePropertyName = typePropertyName;
         _typeIdVisible = typeIdVisible;
-        _deserializers = new ConcurrentHashMap<String, JsonDeserializer<Object>>();
+        // defaults are fine, although concurrency of 4 bit more frugal than 16:
+        _deserializers = new ConcurrentHashMap<String, JsonDeserializer<Object>>(16, 0.75f, 4);
         if (defaultImpl == null) {
             _defaultImpl = null;
         } else {
@@ -83,7 +84,6 @@ protected TypeDeserializerBase(JavaType baseType, TypeIdResolver idRes,
              */
             _defaultImpl = baseType.forcedNarrowBy(defaultImpl);
         }
-
         _property = null;
     }
 
@@ -96,13 +96,12 @@ protected TypeDeserializerBase(TypeDeserializerBase src, BeanProperty property)
         _deserializers = src._deserializers;
         _defaultImpl = src._defaultImpl;
         _defaultImplDeserializer = src._defaultImplDeserializer;
-
         _property = property;
     }
 
     @Override
     public abstract TypeDeserializer forProperty(BeanProperty prop);
-    
+
     /*
     /**********************************************************
     /* Accessors