GROOVY-11136: no jdk7 Map#getOrDefault

apache · Jul 26, 2023 · 3e7da58 · 3e7da58
1 parent d9ce850
commit 3e7da58
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -423,7 +423,9 @@ public static ClassNode correctToGenericsSpecRecurse(Map<String, ClassNode> gene
                     newgTypes[i] = fixed;
                 } else if (oldgType.isPlaceholder()) {
                     // correct "T"
-                    newgTypes[i] = new GenericsType(genericsSpec.getOrDefault(oldgType.getName(), ClassHelper.OBJECT_TYPE));
+                    ClassNode t = genericsSpec.get(oldgType.getName());
+                    if (t == null) t = ClassHelper.OBJECT_TYPE;
+                    newgTypes[i] = new GenericsType(t);
                 } else {
                     // correct "List<T>", etc.
                     newgTypes[i] = new GenericsType(correctToGenericsSpecRecurse(genericsSpec, correctToGenericsSpec(genericsSpec, oldgType), exclusions));