Fixed #1302

Author: cowtowncoder

release-notes/VERSION

@@ -14,6 +14,7 @@ Project: jackson-databind
    with two static factory methods fail by default
 #1297: Deserialization of generic type with Map.class
  (reported by Arek G)
+#1302: NPE for `ResolvedRecursiveType` in 2.8.0 due to caching
 
 2.8.0 (04-Jul-2016)
 

src/main/java/com/fasterxml/jackson/databind/type/ResolvedRecursiveType.java

@@ -98,8 +98,11 @@ public String toString() {
     public boolean equals(Object o) {
         if (o == this) return true;
         if (o == null) return false;
-        if (o.getClass() != getClass()) return false;
-
-        return ((ResolvedRecursiveType) o).getSelfReferencedType().equals(getSelfReferencedType());
+        // Do NOT ever match unresolved references
+        if (_referencedType == null) {
+            return false;
+        }
+        return (o.getClass() == getClass()
+                && _referencedType.equals(((ResolvedRecursiveType) o).getSelfReferencedType()));
     }
 }

src/main/java/com/fasterxml/jackson/databind/type/SimpleType.java

@@ -128,7 +128,7 @@ protected JavaType _narrow(Class<?> subclass)
         // Should we check that there is a sub-class relationship?
         // 15-Jan-2016, tatu: Almost yes, but there are some complications with
         //    placeholder values (`Void`, `NoClass`), so can not quite do yet.
-        // TODO: fix in 2.8
+        // TODO: fix in 2.9
         if (!_class.isAssignableFrom(subclass)) {
             /*
             throw new IllegalArgumentException("Class "+subclass.getName()+" not sub-type of "

src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java

@@ -1269,6 +1269,8 @@ else if (superClass != null) {
             }
         }
         context.resolveSelfReferences(result);
+        // 16-Jul-2016, tatu: [databind#1302] is solved different way, but ideally we shouldn't
+        //     cache anything with partially resolved `ResolvedRecursiveType`... so maybe improve
         if (!result.hasHandlers()) {
             _typeCache.putIfAbsent(key, result); // cache object syncs
         }