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 2022/08/05 20:50:24 UTC
[groovy] 01/02: Trivial refactoring: extract common variable
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 05589aa62c86c3ef2b22d7f431b73e82e818351a
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Aug 6 04:39:54 2022 +0800
Trivial refactoring: extract common variable
(cherry picked from commit bad76e315096099d380af06400ec5b45316099e1)
---
src/main/java/org/apache/groovy/lang/GroovyObjectHelper.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/groovy/lang/GroovyObjectHelper.java b/src/main/java/org/apache/groovy/lang/GroovyObjectHelper.java
index 2740fb8dca..abdee26430 100644
--- a/src/main/java/org/apache/groovy/lang/GroovyObjectHelper.java
+++ b/src/main/java/org/apache/groovy/lang/GroovyObjectHelper.java
@@ -43,11 +43,11 @@ public class GroovyObjectHelper {
* @since 4.0.0
*/
public static Optional<Lookup> lookup(GroovyObject groovyObject) {
- AtomicReference<Lookup> lookupAtomicRef = LOOKUP_MAP.get(groovyObject.getClass());
+ final Class<? extends GroovyObject> groovyObjectClass = groovyObject.getClass();
+ final AtomicReference<Lookup> lookupAtomicRef = LOOKUP_MAP.get(groovyObjectClass);
Lookup lookup = lookupAtomicRef.get();
if (null != lookup) return Optional.of(lookup);
- final Class<? extends GroovyObject> groovyObjectClass = groovyObject.getClass();
if (groovyObjectClass.isMemberClass() && Modifier.isStatic(groovyObjectClass.getModifiers())) {
List<Class<?>> classList = new ArrayList<>(3);
for (Class<?> clazz = groovyObjectClass; null != clazz; clazz = clazz.getEnclosingClass()) {
@@ -80,8 +80,9 @@ public class GroovyObjectHelper {
}
private static Lookup doLookup(GroovyObject groovyObject) {
- MethodHandles.Lookup lookup;
if (groovyObject.getMetaClass().respondsTo(groovyObject, "$getLookup").isEmpty()) return null;
+
+ MethodHandles.Lookup lookup;
try {
final Class<? extends GroovyObject> groovyObjectClass = groovyObject.getClass();
if (groovyObjectClass.isAnonymousClass() ||