Merge pull request #598 from herau/597

fix NPE #597

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

@@ -351,6 +351,9 @@ protected Object _deserializeUsingPropertyBased(final JsonParser jp, final Deser
                         wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                         bean = null; // never gets here
                     }
+                    if (bean == null) {
+                        throw ctxt.instantiationException(_beanType.getRawClass(), " the created object is null");
+                    }
                     //  polymorphic?
                     if (bean.getClass() != _beanType.getRawClass()) {
                         return handlePolymorphic(jp, ctxt, bean, unknown);

src/test/java/com/fasterxml/jackson/failing/TestNpe597.java

@@ -0,0 +1,40 @@
+package com.fasterxml.jackson.failing;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.util.UUID;
+
+public class TestNpe597 extends BaseMapTest
+{
+
+    static class JsonEntity {
+        private final String type;
+        private final UUID id;
+
+        private JsonEntity(String type, UUID id) {
+            this.type = type;
+            this.id = id;
+        }
+
+        @JsonCreator
+        public static JsonEntity create(@JsonProperty("type") String type, @JsonProperty("id") UUID id) {
+            if (type != null && !type.contains(" ") && (id != null)) {
+                return new JsonEntity(type, id);
+            }
+
+            return null;
+        }
+    }
+
+    public void testDeserialize() throws IOException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        String json = "{ \"type\" : \"     \", \"id\" : \"000c0ffb-a0d6-4d2e-a379-4aeaaf283599\" }";
+        objectMapper.readValue(json, JsonEntity.class);
+    }
+
+}