Trivial refactoring (cherry picked from commit 35abb49)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/34ccb246 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/34ccb246 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/34ccb246 Branch: refs/heads/GROOVY_2_6_X Commit: 34ccb246538f63f8c44bb7f1697f5a3ec27edbf0 Parents: 4f9f919 Author: sunlan <[email protected]> Authored: Mon Dec 4 16:03:07 2017 +0800 Committer: sunlan <[email protected]> Committed: Mon Dec 4 16:08:36 2017 +0800 ---------------------------------------------------------------------- src/main/org/codehaus/groovy/control/ProcessingUnit.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/34ccb246/src/main/org/codehaus/groovy/control/ProcessingUnit.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/ProcessingUnit.java b/src/main/org/codehaus/groovy/control/ProcessingUnit.java index adc252d..f7fe1ad 100644 --- a/src/main/org/codehaus/groovy/control/ProcessingUnit.java +++ b/src/main/org/codehaus/groovy/control/ProcessingUnit.java @@ -105,8 +105,8 @@ public abstract class ProcessingUnit { // Classloaders should only be created inside doPrivileged block // This code creates a classloader, which needs permission if a security manage is installed. // If this code might be invoked by code that does not have security permissions, then the classloader creation needs to occur inside a doPrivileged block. - this.classLoader = (GroovyClassLoader) AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + this.classLoader = AccessController.doPrivileged(new PrivilegedAction<GroovyClassLoader>() { + public GroovyClassLoader run() { ClassLoader parent = Thread.currentThread().getContextClassLoader(); if (parent == null) parent = ProcessingUnit.class.getClassLoader(); return loader == null ? new GroovyClassLoader(parent, configuration) : loader;
