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 2021/06/16 13:46:09 UTC
[groovy] branch danielsun/tweak-build updated: Tweak array support
and trivial refactor
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak-build
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/danielsun/tweak-build by this push:
new 4c0c54d Tweak array support and trivial refactor
4c0c54d is described below
commit 4c0c54de5235090778e749b6f7b4ee151a56cc7d
Author: Daniel Sun <su...@apache.org>
AuthorDate: Wed Jun 16 21:44:20 2021 +0800
Tweak array support and trivial refactor
---
src/main/java/groovy/lang/MetaClassImpl.java | 1 +
src/main/java/org/apache/groovy/lang/GroovyObjectHelper.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java
index 04f7ff5..83a0e1d 100644
--- a/src/main/java/groovy/lang/MetaClassImpl.java
+++ b/src/main/java/groovy/lang/MetaClassImpl.java
@@ -1193,6 +1193,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
throw new GroovyRuntimeException(t);
}
}
+ throw mme;
}
if (null == lookup) {
diff --git a/src/main/java/org/apache/groovy/lang/GroovyObjectHelper.java b/src/main/java/org/apache/groovy/lang/GroovyObjectHelper.java
index 90f4fbf..88a4e23 100644
--- a/src/main/java/org/apache/groovy/lang/GroovyObjectHelper.java
+++ b/src/main/java/org/apache/groovy/lang/GroovyObjectHelper.java
@@ -46,12 +46,12 @@ public class GroovyObjectHelper {
if (groovyObjectClass.isAnonymousClass() ||
(groovyObjectClass.isMemberClass() && !Modifier.isStatic(groovyObjectClass.getModifiers()))) {
lookup = (MethodHandles.Lookup) MethodHandles.lookup()
- .findVirtual(groovyObjectClass, "$getLookup", MethodType.methodType(MethodHandles.Lookup.class, new Class[0]))
+ .findVirtual(groovyObjectClass, "$getLookup", MethodType.methodType(MethodHandles.Lookup.class, EMPTY_CLASS_ARRAY))
.bindTo(groovyObject)
.invokeExact();
} else {
lookup = (MethodHandles.Lookup) MethodHandles.lookup()
- .findStatic(groovyObjectClass, "$getLookup", MethodType.methodType(MethodHandles.Lookup.class, new Class[0]))
+ .findStatic(groovyObjectClass, "$getLookup", MethodType.methodType(MethodHandles.Lookup.class, EMPTY_CLASS_ARRAY))
.invokeExact();
}
} catch (Throwable e) {
@@ -62,4 +62,5 @@ public class GroovyObjectHelper {
}
private GroovyObjectHelper() {}
+ private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
}