Merge branch '2.4' into 2.5

Conflicts:
	release-notes/VERSION

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

@@ -173,9 +173,11 @@ public boolean useForType(JavaType t)
                 }
                 // fall through
             case OBJECT_AND_NON_CONCRETE:
-                return (t.getRawClass() == Object.class) || !t.isConcrete()
-                        // [Issue#88] Should not apply to JSON tree models:
-                        || TreeNode.class.isAssignableFrom(t.getRawClass());
+                return t.isJavaLangObject()
+                        || (!t.isConcrete()
+                                // [databind#88] Should not apply to JSON tree models:
+                                && !TreeNode.class.isAssignableFrom(t.getRawClass()));
+
             case NON_FINAL:
                 while (t.isArrayType()) {
                     t = t.getContentType();
@@ -184,7 +186,7 @@ public boolean useForType(JavaType t)
                 return !t.isFinal() && !TreeNode.class.isAssignableFrom(t.getRawClass());
             default:
             //case JAVA_LANG_OBJECT:
-                return (t.getRawClass() == Object.class);
+                return t.isJavaLangObject();
             }
         }
     }

src/test/java/com/fasterxml/jackson/databind/node/TestJsonNode.java

@@ -85,8 +85,6 @@ public void testBinary() throws Exception
         assertEquals("\"Aw==\"", n.toString());
 
         assertEquals("AAMD", new BinaryNode(data).asText());
-
-        // 1.6:
         assertNodeNumbersForNonNumeric(n);
     }
 
@@ -101,10 +99,25 @@ public void testPOJO()
 
         assertEquals(new POJONode(null), new POJONode(null));
 
-        // 1.6:
         // default; non-numeric
         assertNodeNumbersForNonNumeric(n);
         // but if wrapping actual number, use it
         assertNodeNumbers(new POJONode(Integer.valueOf(123)), 123, 123.0);
     }
+
+    // [databind#793]
+    public void testArrayWithDefaultTyping() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper()
+            .enableDefaultTyping();
+
+        JsonNode array = mapper.readTree("[ 1, 2 ]");
+        assertTrue(array.isArray());
+        assertEquals(2, array.size());
+
+        JsonNode obj = mapper.readTree("{ \"a\" : 2 }");
+        assertTrue(obj.isObject());
+        assertEquals(1, obj.size());
+        assertEquals(2, obj.path("a").asInt());
+    }
 }