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 2020/08/09 03:39:04 UTC
[groovy] branch GROOVY_3_0_X updated (55429fb -> 49b04d5)
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 55429fb minor refactor
new c8a229c GROOVY-9679: The fork-join pool does not provide a good ClassLoader for Groovy types(closes #1330)
new 49b04d5 GROOVY-9679: trivial tweak for better backward compatibility
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:
src/main/java/org/codehaus/groovy/control/ProcessingUnit.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[groovy] 02/02: GROOVY-9679: trivial tweak for better backward
compatibility
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 49b04d552e9ba451906df3b54e8506e0a87448eb
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Aug 9 11:36:08 2020 +0800
GROOVY-9679: trivial tweak for better backward compatibility
(cherry picked from commit 21cf8b1de8e11b0ff09f814bdb39786ba4ecfa7e)
---
src/main/java/org/codehaus/groovy/control/ProcessingUnit.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
index a591f5e..d246dfe 100644
--- a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
@@ -101,7 +101,10 @@ public abstract class ProcessingUnit {
// ClassLoaders should only be created inside a doPrivileged block in case
// this method is invoked by code that does not have security permissions.
this.classLoader = loader != null ? loader : AccessController.doPrivileged((PrivilegedAction<GroovyClassLoader>) () -> {
- ClassLoader parent = this.getClass().getClassLoader();
+ ClassLoader parent = Thread.currentThread().getContextClassLoader();
+ if (parent == null) {
+ parent = this.getClass().getClassLoader();
+ }
return new GroovyClassLoader(parent, getConfiguration());
});
}
[groovy] 01/02: GROOVY-9679: The fork-join pool does not provide a
good ClassLoader for Groovy types(closes #1330)
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 c8a229c1539757890ae1812a71f6bb6bbca3afa1
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Jul 30 13:03:47 2020 -0500
GROOVY-9679: The fork-join pool does not provide a good ClassLoader for Groovy types(closes #1330)
- Thread.currentThread().getContextClassLoader() was used starting with
46b1fface0b17cf41f9681894bcb8d78fc831258 -- commit does not state that
this parentage is required for any specific reason; fallback loader (the
one that loaded ProcessingUnit) seems like a better option for Groovy
- StaticTypeCheckingSupport.evaluateExpression(...) relies on loader
created by this block; it does not transfer loader(s) from it's context
(cherry picked from commit 8bd4731e70b9e55a0b36de72d50cd88f87f3aa2e)
---
src/main/java/org/codehaus/groovy/control/ProcessingUnit.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
index 0b12ebf..a591f5e 100644
--- a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
@@ -101,8 +101,7 @@ public abstract class ProcessingUnit {
// ClassLoaders should only be created inside a doPrivileged block in case
// this method is invoked by code that does not have security permissions.
this.classLoader = loader != null ? loader : AccessController.doPrivileged((PrivilegedAction<GroovyClassLoader>) () -> {
- ClassLoader parent = Thread.currentThread().getContextClassLoader();
- if (parent == null) parent = ProcessingUnit.class.getClassLoader();
+ ClassLoader parent = this.getClass().getClassLoader();
return new GroovyClassLoader(parent, getConfiguration());
});
}