GROOVY-7855: NullPointerException in GenericsTypeMatcher
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/cad0a650 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/cad0a650 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/cad0a650 Branch: refs/heads/GROOVY_2_4_X Commit: cad0a650feaf62152e1b90c04daab1147c5f471b Parents: 77f9b9b Author: paulk <pa...@asert.com.au> Authored: Tue Jun 14 23:14:31 2016 +1000 Committer: paulk <pa...@asert.com.au> Committed: Tue Jun 14 23:16:06 2016 +1000 ---------------------------------------------------------------------- src/main/org/codehaus/groovy/ast/GenericsType.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/cad0a650/src/main/org/codehaus/groovy/ast/GenericsType.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/GenericsType.java b/src/main/org/codehaus/groovy/ast/GenericsType.java index 51e10c5..3494b33 100644 --- a/src/main/org/codehaus/groovy/ast/GenericsType.java +++ b/src/main/org/codehaus/groovy/ast/GenericsType.java @@ -441,17 +441,15 @@ public class GenericsType extends ASTNode { gt = classNodePlaceholders.get(gt.getName()); } } - match = match && - (implementsInterfaceOrIsSubclassOf(classNodeType.getType(), gt.getType()) - || classNodeType.isCompatibleWith(gt.getType())); // workaround for GROOVY-6095 + match = implementsInterfaceOrIsSubclassOf(classNodeType.getType(), gt.getType()) + || classNodeType.isCompatibleWith(gt.getType()); // workaround for GROOVY-6095 if (!match) break; } } return match; - } else { + } else if (classNodePlaceholders.containsKey(name)) { redirectBoundType = classNodePlaceholders.get(name); } - } } match = redirectBoundType.isCompatibleWith(classNodeType.getType());
