commit 19ba37248e23156b7898b198d77ee75e6ec6c06e
author Tatu Saloranta <tatu.saloranta@iki.fi> Tue Nov 24 21:13:46 2015 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> Tue Nov 24 21:13:46 2015 -0800
tree 2d21af245001b573d811b854923f161dd4b0febf
parent f54f0f1f64903c5b479b0b42d2d0db6f308d0f31

minor streamlining

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

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
index f67487d..2d22e2a 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -549,7 +549,7 @@
                 }
                 continue;
             }
-            // ignorable things should be ignored
+            // Things marked as ignorable should not be passed to any setter
             if (_ignorableProps != null && _ignorableProps.contains(propName)) {
                 handleIgnoredProperty(p, ctxt, bean, propName);
                 continue;
@@ -672,10 +672,7 @@
                 buffer.bufferProperty(prop, _deserializeWithErrorWrapping(p, ctxt, prop));
                 continue;
             }
-
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
+            // Things marked as ignorable should not be passed to any setter
             if (_ignorableProps != null && _ignorableProps.contains(propName)) {
                 handleIgnoredProperty(p, ctxt, handledType(), propName);
                 continue;
@@ -839,9 +836,7 @@
             if (ext.handlePropertyValue(p, ctxt, propName, null)) {
                 continue;
             }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
+            // Things marked as ignorable should not be passed to any setter
             if (_ignorableProps != null && _ignorableProps.contains(propName)) {
                 handleIgnoredProperty(p, ctxt, handledType(), propName);
                 continue;
@@ -867,6 +862,14 @@
     protected Object deserializeUsingDelegateWithExternalTypeId(JsonParser p, DeserializationContext ctxt)
         throws IOException
     {
-        throw ctxt.mappingException("Combination of External Type Id, Delegating Creator not yet supported");
+        // 24-Nov-2015, tatu: Something along these lines would normally work, in absence
+        //   of external type id:
+        /*
+        Object delegate = _delegateDeserializer.deserialize(p, ctxt);
+        return _valueInstantiator.createUsingDelegate(ctxt, delegate);
+        */
+
+        throw ctxt.instantiationException(handledType(),
+                "Combination of External Type Id, Delegating Creator not yet supported");
     }
 }