You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/04/05 18:43:09 UTC
groovy git commit: Fix failing test:
"Groovy6841Bug.testShouldNotThrowNPEduringCompilation "
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 85ef68ec7 -> f6c559931
Fix failing test: "Groovy6841Bug.testShouldNotThrowNPEduringCompilation "
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f6c55993
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f6c55993
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f6c55993
Branch: refs/heads/GROOVY_2_4_X
Commit: f6c559931bd27f5bc846563f16b5af28d50383e0
Parents: 85ef68e
Author: danielsun1106 <re...@hotmail.com>
Authored: Fri Apr 6 02:43:01 2018 +0800
Committer: danielsun1106 <re...@hotmail.com>
Committed: Fri Apr 6 02:43:01 2018 +0800
----------------------------------------------------------------------
src/main/org/codehaus/groovy/control/ResolveVisitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/f6c55993/src/main/org/codehaus/groovy/control/ResolveVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/org/codehaus/groovy/control/ResolveVisitor.java
index 1114684..4bf3256 100644
--- a/src/main/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/org/codehaus/groovy/control/ResolveVisitor.java
@@ -282,7 +282,7 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
private boolean resolveToNestedOfCurrentClassAndSuperClasses(ClassNode type) {
// GROOVY-8531: Fail to resolve type defined in super class written in Java
- for (ClassNode enclosingClassNode = currentClass; ClassHelper.OBJECT_TYPE != enclosingClassNode; enclosingClassNode = enclosingClassNode.getSuperClass()) {
+ for (ClassNode enclosingClassNode = currentClass; ClassHelper.OBJECT_TYPE != enclosingClassNode && null != enclosingClassNode; enclosingClassNode = enclosingClassNode.getSuperClass()) {
if(resolveToNested(enclosingClassNode, type)) return true;
}