Backport #745 fix for 2.5.3

Author: cowtowncoder

release-notes/CREDITS

@@ -220,3 +220,8 @@ Dylan Scott (dylanscott@github)
   * Reported #738: #738: @JsonTypeInfo non-deterministically ignored in 2.5.1 (concurrency
     issue)
    (2.5.2)
+
+John Meyer (jpmeyer@github)
+  * Reported, contributed fix for #745: EnumDeserializer.deserializerForCreator fails
+    when used to deserialize a Map key
+   (2.5.3)

release-notes/VERSION

@@ -4,6 +4,11 @@ Project: jackson-databind
 === Releases ===
 ------------------------------------------------------------------------
 
+2.5.3 (not yet released)
+
+#745: EnumDeserializer.deserializerForCreator fails when used to deserialize a Map key
+ (contributed by John M)
+
 2.5.2 (29-Mar-2015)
 
 #609: Problem resolving locally declared generic type

src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java

@@ -201,7 +201,12 @@ public Object deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
             if (_deser != null) {
                 value = _deser.deserialize(jp, ctxt);
             } else {
-                value = jp.getValueAsString();
+                JsonToken curr = jp.getCurrentToken();
+                if (curr == JsonToken.VALUE_STRING || curr == JsonToken.FIELD_NAME) {
+                    value = jp.getText();
+                } else {
+                    value = jp.getValueAsString();
+                }
             }
             try {
                 return _factory.invoke(_valueClass, value);