This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_2_5_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 26a2c59e95d63a814cf704f319653f113e2bebf9 Author: Daniel Sun <sun...@apache.org> AuthorDate: Sun Dec 16 23:17:19 2018 +0800 Trivial refactoring: remove unnecessary condition (cherry picked from commit fb1fd0d3368818a88da01155a65e56426426b2cb) --- .../org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java index d786f14..627e7d0 100644 --- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java +++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java @@ -4012,7 +4012,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport { if (exp instanceof VariableExpression) { VariableExpression var = (VariableExpression) exp; final Variable accessedVariable = var.getAccessedVariable(); - if (accessedVariable != null && accessedVariable != exp && accessedVariable instanceof VariableExpression) { + if (accessedVariable != exp && accessedVariable instanceof VariableExpression) { storeType((Expression) accessedVariable, cn); } if (accessedVariable instanceof Parameter) { @@ -4648,7 +4648,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport { checkOrMarkPrivateAccess(vexp, fieldNode, isLHSOfEnclosingAssignment(vexp)); return getType(fieldNode); } - if (variable != null && variable != vexp && variable instanceof VariableExpression) { + if (variable != vexp && variable instanceof VariableExpression) { return getType((Expression) variable); } if (variable instanceof Parameter) {