Merge branch '2.5'

Author: cowtowncoder

release-notes/CREDITS

@@ -221,6 +221,11 @@ Dylan Scott (dylanscott@github)
     issue)
    (2.5.2)
 
+Alexey Gavrilov (Alexey1Gavrilov@github)
+  * Reported, contributed fix for #761: Builder deserializer: in-compatible type exception
+    when return type is super type
+   (2.5.3)
+
 Dmitry Spikhalskiy (Spikhalskiy@github)
   * Reported #731, suggested the way to fix it: XmlAdapter result marshaling error in
     case of ValueType=Object

release-notes/VERSION

@@ -33,6 +33,8 @@ Project: jackson-databind
  (reported by migel@github)
 #745: EnumDeserializer.deserializerForCreator fails when used to deserialize a Map key
  (contributed by John M)
+#761: Builder deserializer: in-compatible type exception when return type is super type
+ (contributed by Alexey G)
 
 2.5.2 (29-Mar-2015)
 

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.java

@@ -379,8 +379,8 @@ public JsonDeserializer<?> buildBuilderBased(JavaType valueType,
                 && !rawBuildType.isAssignableFrom(rawValueType)
                 && !rawValueType.isAssignableFrom(rawBuildType)) {
             throw new IllegalArgumentException("Build method '"+_buildMethod.getFullName()
-        			+" has bad return type ("+rawBuildType.getName()
-        			+"), not compatible with POJO type ("+valueType.getRawClass().getName()+")");
+                    +" has bad return type ("+rawBuildType.getName()
+                    +"), not compatible with POJO type ("+valueType.getRawClass().getName()+")");
         }
         // And if so, we can try building the deserializer
         Collection<SettableBeanProperty> props = _properties.values();