Fix #1150

Author: cowtowncoder

release-notes/CREDITS

@@ -426,3 +426,7 @@ Timur Shakurov (saladinkzn@github)
 Jiri Mikulasek (pirkogdc@github)
   * Reported #1124: JsonAnyGetter ignores JsonSerialize(contentUsing=...)
    (2.7.2)
+
+Xavi Torrens (xavitorrens@github)
+  * Reported #1150: Problem with Object id handling, explicit `null` token
+   (2.7.3)

release-notes/VERSION

@@ -4,7 +4,12 @@ Project: jackson-databind
 === Releases ===
 ------------------------------------------------------------------------
 
-2.7.2 (not released yet)
+2.7.3 (not yet released)
+
+#1150: Problem with Object id handling, explicit `null` token
+ (reported by Xavi T)
+
+2.7.2 (26-Feb-2016)
 
 #1124: JsonAnyGetter ignores JsonSerialize(contentUsing=...)
  (reported by Jiri M)

src/main/java/com/fasterxml/jackson/databind/deser/impl/ObjectIdValueProperty.java

@@ -4,6 +4,7 @@
 import java.lang.annotation.Annotation;
 
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.*;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
@@ -75,17 +76,16 @@ public void deserializeAndSet(JsonParser p, DeserializationContext ctxt,
     public Object deserializeSetAndReturn(JsonParser p,
     		DeserializationContext ctxt, Object instance) throws IOException
     {
-        // note: no null checks (unlike usually); deserializer should fail if one found
-        Object id = _valueDeserializer.deserialize(p, ctxt);
-
         /* 02-Apr-2015, tatu: Actually, as per [databind#742], let it be;
          *  missing or null id is needed for some cases, such as cases where id
          *  will be generated externally, at a later point, and is not available
          *  quite yet. Typical use case is with DB inserts.
          */
-        if (id == null) {
+        // note: no null checks (unlike usually); deserializer should fail if one found
+        if (p.hasToken(JsonToken.VALUE_NULL)) {
             return null;
         }
+        Object id = _valueDeserializer.deserialize(p, ctxt);
         ReadableObjectId roid = ctxt.findObjectId(id, _objectIdReader.generator, _objectIdReader.resolver);
         roid.bindItem(instance);
         // also: may need to set a property value as well

src/test/java/com/fasterxml/jackson/databind/objectid/TestObjectIdSerialization.java

@@ -163,6 +163,21 @@ static class Broken
     @JsonIdentityInfo(generator=ObjectIdGenerators.IntSequenceGenerator.class, property="@id")
     public static class EmptyObject { }
 
+    //for [databind#1150]
+    @JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
+    static class IdentifiableStringId
+    {
+        public String id;
+        public int value;
+
+        public Identifiable next;
+
+        public IdentifiableStringId() { this(0); }
+        public IdentifiableStringId(int v) {
+            value = v;
+        }
+    }
+
     /*
     /*****************************************************
     /* Unit tests, external id serialization
@@ -294,7 +309,16 @@ public void testAlwaysIdForTree() throws Exception
                 json);
 
     }
-    
+
+    //for [databind#1150]
+    public void testNullStringPropertyId() throws Exception
+    {
+        IdentifiableStringId value = MAPPER.readValue
+                (aposToQuotes("{'value':3, 'next':null, 'id':null}"), IdentifiableStringId.class);
+        assertNotNull(value);
+        assertEquals(3, value.value);
+    }    
+
     /*
     /*****************************************************
     /* Unit tests, error handling