Repository: groovy Updated Branches: refs/heads/master ac0e1d232 -> 419ca1c19
Trivial refactoring Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/419ca1c1 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/419ca1c1 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/419ca1c1 Branch: refs/heads/master Commit: 419ca1c19895b85ee22e54ab35ffb85e41d2b94d Parents: ac0e1d2 Author: sunlan <[email protected]> Authored: Tue Jun 26 08:50:39 2018 +0800 Committer: sunlan <[email protected]> Committed: Tue Jun 26 08:50:39 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/419ca1c1/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/419ca1c1/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();
