commit f54f0f1f64903c5b479b0b42d2d0db6f308d0f31
author Tatu Saloranta <tatu.saloranta@iki.fi> Tue Nov 24 20:52:01 2015 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> Tue Nov 24 20:52:01 2015 -0800
tree bb9dae8bc1304436467018e6226517e8f980e3a9
parent 4a8e9b4279131ee3504119c9d94c732776058abe

Add temporary exception for unsupported (as of yet) combo of delegating creator, external type id

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 2dafe1b..f67487d 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -716,6 +716,10 @@
         if (_propertyBasedCreator != null) {
             return deserializeUsingPropertyBasedWithExternalTypeId(p, ctxt);
         }
+        if (_delegateDeserializer != null) {
+            return deserializeUsingDelegateWithExternalTypeId(p, ctxt);
+        }
+
         return deserializeWithExternalTypeId(p, ctxt, _valueInstantiator.createUsingDefault(ctxt));
     }
 
@@ -856,4 +860,13 @@
             return null; // never gets here
         }
     }
+
+    /**
+     * @since 2.7
+     */
+    protected Object deserializeUsingDelegateWithExternalTypeId(JsonParser p, DeserializationContext ctxt)
+        throws IOException
+    {
+        throw ctxt.mappingException("Combination of External Type Id, Delegating Creator not yet supported");
+    }
 }