Merge branch '2.9' into 2.10

FasterXML · Jul 30, 2019 · 236127c · 236127c
2 parents 7bf799c + 68b1f71
commit 236127c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -864,7 +864,12 @@ Daniil Barvitsky (dbarvitsky@github)
 
 Edgar Asatryan (nstdio@github)
   * Reported #2374: `ObjectMapper. getRegisteredModuleIds()` throws NPE if no modules registered
-   (2.9.10)
+   (2.9.9.1)
+
+Michael Simons (michael-simons@github)
+  * Reported #2395: `NullPointerException` from `ResolvedRecursiveType` (regression due to
+    fix for #2331)
+   (2.9.9.3)
 
 Christoph Breitkopf (bokesan@github)
   * Reported #2217: Suboptimal memory allocation in `TextNode.getBinaryValue()`

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -61,6 +61,11 @@ Project: jackson-databind
 #2339: Suboptimal return type for `ObjectNode.set()`
  (reported by Victor N)
 
+2.9.9.3 (not yet released)
+
+#2395: `NullPointerException` from `ResolvedRecursiveType` (regression due to fix for #2331)
+ (reported by Michael S)
+
 2.9.9.2 (27-Jul-2019)
 
 #2331: `JsonMappingException` through nested getter with generic wildcard return type

diff --git a/src/main/java/com/fasterxml/jackson/databind/type/ResolvedRecursiveType.java b/src/main/java/com/fasterxml/jackson/databind/type/ResolvedRecursiveType.java
@@ -39,16 +39,25 @@ public JavaType getSuperClass() {
     // 23-Jul-2019, tatu: [databind#2331] Need to also delegate this...
     @Override
     public TypeBindings getBindings() {
-        return _referencedType.getBindings();
+        if (_referencedType != null) { // `null` before resolution [databind#2395]
+            return _referencedType.getBindings();
+        }
+        return super.getBindings();
     }
 
     @Override
     public StringBuilder getGenericSignature(StringBuilder sb) {
+        if (_referencedType != null) {
+            return _referencedType.getGenericSignature(sb);
+        }
         return _referencedType.getGenericSignature(sb);
     }
 
     @Override
     public StringBuilder getErasedSignature(StringBuilder sb) {
+        if (_referencedType != null) {
+            return _referencedType.getErasedSignature(sb);
+        }
         return _referencedType.getErasedSignature(sb);
     }
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
@@ -197,7 +197,11 @@ public TypeFactory withModifier(TypeModifier mod)
             typeCache = null;
         } else if (_modifiers == null) {
             mods = new TypeModifier[] { mod };
+            // 29-Jul-2019, tatu: Actually I think we better clear cache in this case
+            //    as well to ensure no leakage occurs (see [databind#2395])
+            typeCache = null;
         } else {
+            // but may keep existing cache otherwise
             mods = ArrayBuilders.insertInListNoDup(_modifiers, mod);
         }
         return new TypeFactory(typeCache, _parser, mods, _classLoader);