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 2019/11/03 04:38:57 UTC
[groovy] branch GROOVY_3_0_X updated (4c17ab7 -> c0e5655)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 4c17ab7 Fix the caller class
new 75ab9fa Support better extensibility for caller class
new c0e5655 Tweak javadoc
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java | 2 +-
.../java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java | 2 +-
src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java | 2 +-
src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java | 4 +++-
4 files changed, 6 insertions(+), 4 deletions(-)
[groovy] 02/02: Tweak javadoc
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit c0e565579dcf143881fc999fe9a34da950256b63
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Nov 3 12:34:46 2019 +0800
Tweak javadoc
(cherry picked from commit bb690c434a591f1b45880edf69dfcccfd1444534)
---
src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java b/src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java
index b5118d3..58caf26 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java
@@ -99,7 +99,7 @@ public interface VMPlugin {
* @param metaClass meta class
* @param metaMethod the original meta method
* @param params parameter types
- * @param caller caller type
+ * @param caller caller class, whose method sets accessible for methods
* @return the transformed meta method
*/
MetaMethod transformMetaMethod(MetaClass metaClass, MetaMethod metaMethod, Class<?>[] params, Class<?> caller);
[groovy] 01/02: Support better extensibility for caller class
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 75ab9fa4bdd90f089b22b95b422e0d78814bccb5
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Nov 3 12:31:12 2019 +0800
Support better extensibility for caller class
(cherry picked from commit 8ec7bf71f2ba13fcca059fffb92ae5b76707d3c7)
---
.../java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java | 2 +-
.../java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java | 2 +-
src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java
index cc8be1e..89a563e 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java
@@ -160,7 +160,7 @@ public class PogoMetaMethodSite extends PlainObjectMetaMethodSite {
final Method reflect;
public PogoCachedMethodSite(CallSite site, MetaClassImpl metaClass, CachedMethod metaMethod, Class[] params) {
- super(site, metaClass, VM_PLUGIN.transformMetaMethod(metaClass, metaMethod, params, site.getArray().owner), params);
+ super(site, metaClass, VM_PLUGIN.transformMetaMethod(metaClass, metaMethod, params), params);
reflect = ((CachedMethod) super.metaMethod).setAccessible();
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java
index e1ab089..ff77eea 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java
@@ -181,7 +181,7 @@ public class PojoMetaMethodSite extends PlainObjectMetaMethodSite {
final Method reflect;
public PojoCachedMethodSite(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class[] params) {
- super(site, metaClass, VM_PLUGIN.transformMetaMethod(metaClass, metaMethod, params, site.getArray().owner), params);
+ super(site, metaClass, VM_PLUGIN.transformMetaMethod(metaClass, metaMethod, params), params);
reflect = ((CachedMethod) super.metaMethod).setAccessible();
}
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
index 797eae0..7c8390d 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
@@ -184,7 +184,9 @@ public class Java9 extends Java8 {
int methodModifiers = cachedMethod.getModifiers();
- caller = ReflectionUtils.class; // "set accessible" are done via `org.codehaus.groovy.reflection.ReflectionUtils` as shown in warnings
+ if (null == caller) {
+ caller = ReflectionUtils.class; // "set accessible" are done via `org.codehaus.groovy.reflection.ReflectionUtils` as shown in warnings
+ }
// if caller can access the method,
// no need to transform the meta method