From commits-return-7037-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Thu Jul 5 07:56:20 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 27C4F180657 for ; Thu, 5 Jul 2018 07:56:19 +0200 (CEST) Received: (qmail 38917 invoked by uid 500); 5 Jul 2018 05:56:19 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 38908 invoked by uid 99); 5 Jul 2018 05:56:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2018 05:56:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A7096DFC7B; Thu, 5 Jul 2018 05:56:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sunlan@apache.org To: commits@groovy.apache.org Message-Id: <0ff9d64d692f4d46b5ecd7ac9278c761@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: Trivial refactoring: remove redundant variable declaration Date: Thu, 5 Jul 2018 05:56:18 +0000 (UTC) Repository: groovy Updated Branches: refs/heads/GROOVY_2_5_X abaf687d6 -> 5aecfefe5 Trivial refactoring: remove redundant variable declaration (cherry picked from commit beea69d) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5aecfefe Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5aecfefe Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5aecfefe Branch: refs/heads/GROOVY_2_5_X Commit: 5aecfefe51d26bbe26d8894c9272e7ed5880def7 Parents: abaf687 Author: sunlan Authored: Thu Jul 5 12:41:46 2018 +0800 Committer: sunlan Committed: Thu Jul 5 13:56:13 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/5aecfefe/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) {