Minor addition related to FasterXML#1087: resolve context type, assum…

…ing type bindings from that are expected to work.
aryehpro · Jan 24, 2016 · 83e5147 · 83e5147
1 parent 036fe28
commit 83e5147
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
@@ -599,7 +599,7 @@ public JavaType constructType(TypeReference<?> typeRef)
      */
     @Deprecated
     public JavaType constructType(Type type, Class<?> contextType) {
-        return _fromAny(null, type, EMPTY_BINDINGS);
+        return constructType(type, constructType(contextType));
     }
 
     /**

diff --git a/src/test/java/com/fasterxml/jackson/failing/ExternalTypeId999Test.java b/src/test/java/com/fasterxml/jackson/failing/ExternalTypeId999Test.java
@@ -28,12 +28,12 @@ public static class Message<P extends Payload>
         public Message(@JsonProperty("type") String type,
                 @JsonProperty("payload") P payload)
         {
-            if (type == null) {
-                throw new RuntimeException("'type' is null");
-            }
             if (payload == null) {
                 throw new RuntimeException("'payload' is null");
             }
+            if (type == null) {
+                throw new RuntimeException("'type' is null");
+            }
             this.type = type;
             this.payload = payload;
         }