Fix for #1123: async content assist cannot load groovy.lang.GroovyObject

evaluateExpression gets its ClassLoader from ProcessingUnit; in the fork-join pool, the thread context loader is not good for Groovy
groovy · Jul 30, 2020 · da8a60c · da8a60c
1 parent 8cb38ac
commit da8a60c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/base/org.codehaus.groovy24/src/org/codehaus/groovy/control/ProcessingUnit.java b/base/org.codehaus.groovy24/src/org/codehaus/groovy/control/ProcessingUnit.java
@@ -97,8 +97,12 @@ public void setClassLoader(final GroovyClassLoader loader) {
         // this method is invoked by code that does not have security permissions.
         this.classLoader = loader != null ? loader : AccessController.doPrivileged(new PrivilegedAction<GroovyClassLoader>() {
             public GroovyClassLoader run() {
+                /* GRECLIPSE edit -- async content assist cannot process DelegatesTo/ClosureParams
                 ClassLoader parent = Thread.currentThread().getContextClassLoader();
                 if (parent == null) parent = ProcessingUnit.class.getClassLoader();
+                */
+                ClassLoader parent = this.getClass().getClassLoader();
+                // GRECLIPSE end
                 return new GroovyClassLoader(parent, getConfiguration());
             }
         });

diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/control/ProcessingUnit.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/control/ProcessingUnit.java
@@ -97,8 +97,12 @@ public void setClassLoader(final GroovyClassLoader loader) {
         // this method is invoked by code that does not have security permissions.
         this.classLoader = loader != null ? loader : AccessController.doPrivileged(new PrivilegedAction<GroovyClassLoader>() {
             public GroovyClassLoader run() {
+                /* GRECLIPSE edit -- async content assist cannot process DelegatesTo/ClosureParams
                 ClassLoader parent = Thread.currentThread().getContextClassLoader();
                 if (parent == null) parent = ProcessingUnit.class.getClassLoader();
+                */
+                ClassLoader parent = this.getClass().getClassLoader();
+                // GRECLIPSE end
                 return new GroovyClassLoader(parent, getConfiguration());
             }
         });

diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/control/ProcessingUnit.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/control/ProcessingUnit.java
@@ -104,8 +104,12 @@ public void setClassLoader(final GroovyClassLoader loader) {
         // 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>) () -> {
+            /* GRECLIPSE edit -- async content assist cannot process DelegatesTo/ClosureParams
             ClassLoader parent = Thread.currentThread().getContextClassLoader();
             if (parent == null) parent = ProcessingUnit.class.getClassLoader();
+            */
+            ClassLoader parent = this.getClass().getClassLoader();
+            // GRECLIPSE end
             return new GroovyClassLoader(parent, getConfiguration());
         });
     }