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/07/05 04:41:56 UTC

groovy git commit: Trivial refactoring: remove redundant variable declaration

Repository: groovy
Updated Branches:
  refs/heads/master 40269f772 -> beea69d85


Trivial refactoring: remove redundant variable declaration


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/beea69d8
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/beea69d8
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/beea69d8

Branch: refs/heads/master
Commit: beea69d85417486505569a1f12bb5d6264139374
Parents: 40269f7
Author: sunlan <su...@apache.org>
Authored: Thu Jul 5 12:41:46 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Thu Jul 5 12:41:46 2018 +0800

----------------------------------------------------------------------
 .../java/org/codehaus/groovy/control/ResolveVisitor.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/beea69d8/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
index 90dc125..6087cd4 100644
--- a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
@@ -738,9 +738,9 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
         }
 
         if (currentClass.getModule().hasPackageName() && name.indexOf('.') == -1) return false;
-        LookupResult lr = null;
-        lr = classNodeResolver.resolveName(name, compilationUnit);
-        if (lr!=null) {
+
+        LookupResult lr = classNodeResolver.resolveName(name, compilationUnit);
+        if (lr != null) {
             if (lr.isSourceUnit()) {
                 SourceUnit su = lr.getSourceUnit();
                 currentClass.getCompileUnit().addClassNodeToCompile(type, su);
@@ -755,7 +755,7 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
 
     public Expression transform(Expression exp) {
         if (exp == null) return null;
-        Expression ret = null;
+        Expression ret;
         if (exp instanceof VariableExpression) {
             ret = transformVariableExpression((VariableExpression) exp);
         } else if (exp.getClass() == PropertyExpression.class) {