Merge branch '2.8'

Author: cowtowncoder

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

@@ -204,7 +204,7 @@ private final Object _deserializeAltString(JsonParser p, DeserializationContext
         name = name.trim();
         if (name.length() == 0) {
             if (ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
-                return null;
+                return getEmptyValue(ctxt);
             }
         } else {
             // [databind#1313]: Case insensitive enum deserialization
@@ -245,15 +245,8 @@ private final Object _deserializeAltString(JsonParser p, DeserializationContext
     protected Object _deserializeOther(JsonParser p, DeserializationContext ctxt) throws IOException
     {
         // [databind#381]
-        if (ctxt.isEnabled(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
-                && p.isExpectedStartArrayToken()) {
-            p.nextToken();
-            final Object parsed = deserialize(p, ctxt);
-            JsonToken curr = p.nextToken();
-            if (curr != JsonToken.END_ARRAY) {
-                handleMissingEndArrayForSingle(p, ctxt);
-            }
-            return parsed;
+        if (p.hasToken(JsonToken.START_ARRAY)) {
+            return _deserializeFromArray(p, ctxt);
         }
         return ctxt.handleUnexpectedToken(_enumClass(), p);
     }

src/test/java/com/fasterxml/jackson/databind/struct/EmptyArrayAsNullTest.java

@@ -125,6 +125,10 @@ public void testNullStringFromEmptyArray() throws Exception {
         _testNullWrapper(String.class);
     }
 
+    public void testNullEnumFromEmptyArray() throws Exception {
+        _testNullWrapper(ABC.class);
+    }
+
     public void testStdJdkTypesFromEmptyArray() throws Exception
     {
         _testNullWrapper(BigInteger.class);