Fix #647

Author: cowtowncoder

release-notes/CREDITS

@@ -183,3 +183,8 @@ Michael Ressler (mressler@github)
   * Contributed #566: Add support for case-insensitive deserialization
    (`MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES`)
    (2.5.0)
+
+Konstantin Labun (kulabun@github)
+  * Reported #647: Deserialization fails when @JsonUnwrapped property contains an object with same property name
+   (2.5.0)
+

release-notes/VERSION

@@ -58,7 +58,9 @@ Project: jackson-databind
 #636: `ClassNotFoundException` for classes not (yet) needed during serialization
  (contributed by mspiegel@github)
 #638: Add annotation-based method(s) for injecting properties during serialization
-  (using @JsonAppend, VirtualBeanPropertyWriter)
+ (using @JsonAppend, VirtualBeanPropertyWriter)
+#647: Deserialization fails when @JsonUnwrapped property contains an object with same property name
+ (reported by Konstantin L)
 - Allow use of `Shape.ARRAY` for Enums, as an alias to 'use index'
 - Start using `JsonGenerator.writeStartArray(int)` to help data formats
   that benefit from knowing number of elements in arrays (and would otherwise

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

@@ -461,10 +461,10 @@ public void resolve(DeserializationContext ctxt)
                     unwrapped = new UnwrappedPropertyHandler();
                 }
                 unwrapped.addProperty(prop);
-                // 10-Apr-2014, tatu: Looks like we should also do this? (no observed diff tho)
-                if (prop != origProp) {
-                    _beanProperties.replace(prop);
-                }
+                /* 12-Dec-2014, tatu: As per [databind#647], we will have problems if
+                 *    the original property is left in place. So let's remove it now.
+                 */
+                _beanProperties.remove(prop);
                 continue;
             }
             // [JACKSON-594]: non-static inner classes too:

src/test/java/com/fasterxml/jackson/failing/TestUnwrappedWithSameName647.java renamed to src/test/java/com/fasterxml/jackson/databind/struct/TestUnwrappedWithSameName647.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.struct;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.fasterxml.jackson.databind.*;