You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by jw...@apache.org on 2016/08/07 02:59:25 UTC
[1/4] groovy git commit: GROOVY-7884: GroovyScriptEngineImpl usage of
CompilerConfiguration can lead to memory leaks (closes #377)
Repository: groovy
Updated Branches:
refs/heads/master a1e97f17d -> ef86c2c4d
GROOVY-7884: GroovyScriptEngineImpl usage of CompilerConfiguration can lead to memory leaks (closes #377)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/6754d4a4
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/6754d4a4
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/6754d4a4
Branch: refs/heads/master
Commit: 6754d4a4341d56277325469176caaf0d78996927
Parents: a1e97f1
Author: John Wagenleitner <jw...@apache.org>
Authored: Sat Aug 6 18:59:59 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sat Aug 6 18:59:59 2016 -0700
----------------------------------------------------------------------
.../java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/6754d4a4/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
index 90a5831..d4168f8 100644
--- a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+++ b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
@@ -116,7 +116,7 @@ public class GroovyScriptEngineImpl extends AbstractScriptEngine implements Comp
}
public GroovyScriptEngineImpl() {
- this(new GroovyClassLoader(getParentLoader(), new CompilerConfiguration()));
+ this(new GroovyClassLoader(getParentLoader(), new CompilerConfiguration(CompilerConfiguration.DEFAULT)));
}
public GroovyScriptEngineImpl(GroovyClassLoader classLoader) {
[4/4] groovy git commit: minor refactor: remove use of raw types
Posted by jw...@apache.org.
minor refactor: remove use of raw types
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ef86c2c4
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ef86c2c4
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ef86c2c4
Branch: refs/heads/master
Commit: ef86c2c4db4e3d6fb82be3fad1177f9d0364093f
Parents: 6b7c908
Author: John Wagenleitner <jw...@apache.org>
Authored: Sat Aug 6 19:53:17 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sat Aug 6 19:53:17 2016 -0700
----------------------------------------------------------------------
.../groovy/jsr223/GroovyCompiledScript.java | 4 ++--
.../groovy/jsr223/GroovyScriptEngineImpl.java | 18 +++++++++---------
.../codehaus/groovy/jsr223/ScriptExtensions.java | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/ef86c2c4/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
index e7bb44c..4962aa5 100644
--- a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
+++ b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
@@ -61,9 +61,9 @@ import javax.script.ScriptException;
public class GroovyCompiledScript extends CompiledScript {
private final GroovyScriptEngineImpl engine;
- private final Class clasz;
+ private final Class<?> clasz;
- public GroovyCompiledScript(GroovyScriptEngineImpl engine, Class clazz) {
+ public GroovyCompiledScript(GroovyScriptEngineImpl engine, Class<?> clazz) {
this.engine = engine;
this.clasz = clazz;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/ef86c2c4/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
index 406668a..8fe62a5 100644
--- a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+++ b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
@@ -97,10 +97,10 @@ public class GroovyScriptEngineImpl extends AbstractScriptEngine implements Comp
private static boolean debug = false;
// script-string-to-generated Class map
- private final ManagedConcurrentValueMap<String, Class> classMap = new ManagedConcurrentValueMap<String, Class>(ReferenceBundle.getSoftBundle());
+ private final ManagedConcurrentValueMap<String, Class<?>> classMap = new ManagedConcurrentValueMap<String, Class<?>>(ReferenceBundle.getSoftBundle());
// global closures map - this is used to simulate a single
// global functions namespace
- private final ManagedConcurrentValueMap<String, Closure> globalClosures = new ManagedConcurrentValueMap<String, Closure>(ReferenceBundle.getHardBundle());
+ private final ManagedConcurrentValueMap<String, Closure<?>> globalClosures = new ManagedConcurrentValueMap<String, Closure<?>>(ReferenceBundle.getHardBundle());
// class loader for Groovy generated classes
private GroovyClassLoader loader;
// lazily initialized factory
@@ -150,7 +150,7 @@ public class GroovyScriptEngineImpl extends AbstractScriptEngine implements Comp
} catch (ClassCastException cce) { /*ignore.*/ }
try {
- Class clazz = getScriptClass(script);
+ Class<?> clazz = getScriptClass(script);
if (clazz == null) throw new ScriptException("Script class is null");
return eval(clazz, ctx);
} catch (Exception e) {
@@ -214,7 +214,7 @@ public class GroovyScriptEngineImpl extends AbstractScriptEngine implements Comp
}
// package-privates
- Object eval(Class scriptClass, final ScriptContext ctx) throws ScriptException {
+ Object eval(Class<?> scriptClass, final ScriptContext ctx) throws ScriptException {
/*
* We use the following Binding instance so that global variable lookup
* will be done in the current ScriptContext instance.
@@ -321,9 +321,9 @@ public class GroovyScriptEngineImpl extends AbstractScriptEngine implements Comp
}
}
- Class getScriptClass(String script)
+ Class<?> getScriptClass(String script)
throws CompilationFailedException {
- Class clazz = classMap.get(script);
+ Class<?> clazz = classMap.get(script);
if (clazz != null) {
return clazz;
}
@@ -369,7 +369,7 @@ public class GroovyScriptEngineImpl extends AbstractScriptEngine implements Comp
}
private Object callGlobal(String name, Object[] args, ScriptContext ctx) {
- Closure closure = globalClosures.get(name);
+ Closure<?> closure = globalClosures.get(name);
if (closure != null) {
return closure.call(args);
} else {
@@ -396,7 +396,7 @@ public class GroovyScriptEngineImpl extends AbstractScriptEngine implements Comp
}
return (T) Proxy.newProxyInstance(
clazz.getClassLoader(),
- new Class[]{clazz},
+ new Class<?>[]{clazz},
new InvocationHandler() {
public Object invoke(Object proxy, Method m, Object[] args)
throws Throwable {
@@ -411,7 +411,7 @@ public class GroovyScriptEngineImpl extends AbstractScriptEngine implements Comp
// check whether thread context loader can "see" Groovy Script class
ClassLoader ctxtLoader = Thread.currentThread().getContextClassLoader();
try {
- Class c = ctxtLoader.loadClass(Script.class.getName());
+ Class<?> c = ctxtLoader.loadClass(Script.class.getName());
if (c == Script.class) {
return ctxtLoader;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/ef86c2c4/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java
index 9181804..e591664 100644
--- a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java
+++ b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java
@@ -84,8 +84,8 @@ public class ScriptExtensions {
@SuppressWarnings("unchecked")
private static void storeBindingVars(ScriptEngine self, Binding binding) {
- Set<Map.Entry> vars = binding.getVariables().entrySet();
- for (Map.Entry me : vars) {
+ Set<Map.Entry<?, ?>> vars = binding.getVariables().entrySet();
+ for (Map.Entry<?, ?> me : vars) {
self.put(me.getKey().toString(), me.getValue());
}
}
[3/4] groovy git commit: minor cleanup: no need to import classes
from java.lang
Posted by jw...@apache.org.
minor cleanup: no need to import classes from java.lang
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/6b7c9089
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/6b7c9089
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/6b7c9089
Branch: refs/heads/master
Commit: 6b7c90891ce964f4103e7e8de14e9d65fba29d72
Parents: a82b86e
Author: John Wagenleitner <jw...@apache.org>
Authored: Sat Aug 6 19:02:01 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sat Aug 6 19:02:01 2016 -0700
----------------------------------------------------------------------
.../java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/6b7c9089/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
index d4168f8..406668a 100644
--- a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+++ b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
@@ -79,8 +79,6 @@ import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
-import java.lang.Class;
-import java.lang.String;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
[2/4] groovy git commit: minor refactor: use enhanced for loop
Posted by jw...@apache.org.
minor refactor: use enhanced for loop
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a82b86ef
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a82b86ef
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a82b86ef
Branch: refs/heads/master
Commit: a82b86ef25e59fb45a5797acdb4a1b4da0a680f6
Parents: 6754d4a
Author: John Wagenleitner <jw...@apache.org>
Authored: Sat Aug 6 19:01:31 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sat Aug 6 19:01:31 2016 -0700
----------------------------------------------------------------------
.../org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a82b86ef/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
index b804b06..759ced7 100644
--- a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
+++ b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
@@ -180,10 +180,8 @@ public class GroovyScriptEngineFactory implements ScriptEngineFactory {
public String getProgram(String... statements) {
StringBuilder ret = new StringBuilder();
- int len = statements.length;
- for (int i = 0; i < len; i++) {
- ret.append(statements[i]);
- ret.append('\n');
+ for (String statement : statements) {
+ ret.append(statement).append('\n');
}
return ret.toString();
}