Merge branch '2.6'

FasterXML · Oct 6, 2015 · 5a45002 · 5a45002
2 parents 13b6909 + 5ae6e4b
commit 5a45002
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java b/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java
@@ -753,6 +753,7 @@ public <T> T readValue(JsonParser p, Class<T> type) throws IOException {
     public <T> T readValue(JsonParser p, JavaType type) throws IOException {
         JsonDeserializer<Object> deser = findRootValueDeserializer(type);
         if (deser == null) {
+            throw mappingException("Could not find JsonDeserializer for type %s", type);
         }
         return (T) deser.deserialize(p, this);
     }
@@ -776,11 +777,13 @@ public <T> T readPropertyValue(JsonParser p, BeanProperty prop, Class<T> type) t
     public <T> T readPropertyValue(JsonParser p, BeanProperty prop, JavaType type) throws IOException {
         JsonDeserializer<Object> deser = findContextualValueDeserializer(type, prop);
         if (deser == null) {
-
+            String propName = (prop == null) ? "NULL" : ("'"+prop.getName()+"'");
+            throw mappingException("Could not find JsonDeserializer for type %s (via property %s)",
+                    type, propName);
         }
         return (T) deser.deserialize(p, this);
     }
-    
+
     /*
     /**********************************************************
     /* Methods for problem handling, reporting