[groovy] branch master updated: Revert "GROOVY-9679: trivial tweak for better backward compatibility"

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new fa1cd74  Revert "GROOVY-9679: trivial tweak for better backward compatibility"
fa1cd74 is described below

commit fa1cd74564977c67e554601b6a607acedaecb074
Author: Daniel Sun <su...@apache.org>
AuthorDate: Mon Aug 10 01:06:45 2020 +0800

    Revert "GROOVY-9679: trivial tweak for better backward compatibility"
    
    This reverts commit 21cf8b1d
---
 src/main/java/org/codehaus/groovy/control/ProcessingUnit.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
index d246dfe..a591f5e 100644
--- a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
@@ -101,10 +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 = this.getClass().getClassLoader();
-            }
+            ClassLoader parent = this.getClass().getClassLoader();
             return new GroovyClassLoader(parent, getConfiguration());
         });
     }