Backport #378 in 2.3 branch

Author: cowtowncoder

release-notes/VERSION

@@ -1,5 +1,14 @@
 Project: jackson-databind
-Version: 2.3.1 (28-Dec-2013)
+Version: 2.3.2 (xx-xxx-2014)
+
+#378: Fix a problem with custom enum deserializer construction
+ (reported by BokoEnos@github)
+
+------------------------------------------------------------------------
+=== History: ===
+------------------------------------------------------------------------
+
+2.3.1 (28-Dec-2013)
 
 #346: Fix problem deserializing `ObjectNode`, with @JsonCreator, empty
   JSON Object
@@ -17,10 +26,6 @@ Version: 2.3.1 (28-Dec-2013)
 - Fix for [jackson-module-afterburner#38]: need to remove @JacksonStdImpl from
   `RawSerializer`, to avoid accidental removal of proper handling.
 
-------------------------------------------------------------------------
-=== History: ===
-------------------------------------------------------------------------
-
 2.3.0 (13-Nov-2013)
 
 #48: Add support for `InetSocketAddress`

src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java

@@ -1269,7 +1269,7 @@ private KeyDeserializer _createEnumKeyDeserializer(DeserializationContext ctxt,
         // 23-Nov-2010, tatu: Custom deserializer?
         JsonDeserializer<?> custom = _findCustomEnumDeserializer(enumClass, config, beanDesc);
         if (custom != null) {
-            return StdKeyDeserializers.constructDelegatingKeyDeserializer(config, type, des);
+            return StdKeyDeserializers.constructDelegatingKeyDeserializer(config, type, custom);
         }
 
         EnumResolver<?> enumRes = constructEnumResolver(enumClass, config, beanDesc.findJsonValueMethod());