Merge pull request #378 from BokoEnos/patch-1

cowtowncoder · cowtowncoder · commit 4fa5106ae83f · 2014-01-06T11:25:35.000-08:00
Update BasicDeserializerFactory.java
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java b/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());

Original file line number	Diff line number	Diff line change
`@@ -1269,7 +1269,7 @@ private KeyDeserializer _createEnumKeyDeserializer(DeserializationContext ctxt,`
`1269`	`1269`	`// 23-Nov-2010, tatu: Custom deserializer?`
`1270`	`1270`	`JsonDeserializer<?> custom = _findCustomEnumDeserializer(enumClass, config, beanDesc);`
`1271`	`1271`	`if (custom != null) {`
`1272`		`- return StdKeyDeserializers.constructDelegatingKeyDeserializer(config, type, des);`
	`1272`	`+ return StdKeyDeserializers.constructDelegatingKeyDeserializer(config, type, custom);`
`1273`	`1273`	`}`
`1274`	`1274`
`1275`	`1275`	`EnumResolver<?> enumRes = constructEnumResolver(enumClass, config, beanDesc.findJsonValueMethod());`