From commits-return-6981-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Tue Jun 26 02:51:10 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 4ABB8180627 for ; Tue, 26 Jun 2018 02:51:10 +0200 (CEST) Received: (qmail 18674 invoked by uid 500); 26 Jun 2018 00:51:09 -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 18665 invoked by uid 99); 26 Jun 2018 00:51:09 -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; Tue, 26 Jun 2018 00:51:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 340D4E0A42; Tue, 26 Jun 2018 00:51:09 +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: <671d353767e34b8da7ae97a754aeccd1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: Trivial refactoring Date: Tue, 26 Jun 2018 00:51:09 +0000 (UTC) Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 896ec206f -> ca74e69f6 Trivial refactoring (cherry picked from commit 419ca1c) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ca74e69f Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ca74e69f Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ca74e69f Branch: refs/heads/GROOVY_2_6_X Commit: ca74e69f60048b9141ffe926964ab321c941a985 Parents: 896ec20 Author: sunlan Authored: Tue Jun 26 08:50:39 2018 +0800 Committer: sunlan Committed: Tue Jun 26 08:51:02 2018 +0800 ---------------------------------------------------------------------- src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java | 5 +---- .../org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/ca74e69f/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java b/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java index e2dedf7..9cd26a0 100644 --- a/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java +++ b/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java @@ -321,10 +321,7 @@ public class ClassNodeUtils { * @throws NullPointerException if either of the given nodes are null */ public static boolean samePackageName(ClassNode first, ClassNode second) { - String firstPackage = first.getPackageName(); - String secondPackage = second.getPackageName(); - return (Objects.equals(firstPackage, secondPackage)) - || (firstPackage != null && firstPackage.equals(secondPackage)); + return Objects.equals(first.getPackageName(), second.getPackageName()); } } http://git-wip-us.apache.org/repos/asf/groovy/blob/ca74e69f/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java index 7268397..6133ccf 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java @@ -208,7 +208,7 @@ public class MetaMethodIndex { int h = hash(31 * cls.hashCode() + name.hashCode()); Entry e = table[h & (table.length - 1)]; for (; e != null; e = e.nextHashEntry) - if (e.hash == h && cls == e.cls && (Objects.equals(e.name, name) || e.name.equals(name)) ) + if (e.hash == h && cls == e.cls && Objects.equals(e.name, name) ) return e; return null; @@ -221,7 +221,7 @@ public class MetaMethodIndex { final int index = h & (t.length - 1); Entry e = t[index]; for (; e != null; e = e.nextHashEntry) - if (e.hash == h && cls == e.cls && (Objects.equals(e.name, name) || e.name.equals(name)) ) + if (e.hash == h && cls == e.cls && Objects.equals(e.name, name) ) return e; Entry entry = new Entry();