root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Bsh/GroovyScriptFactory reset script cache in case of compilation error 

Issue: SPR-14007
This commit is contained in:
Juergen Hoeller 2016-03-11 12:55:20 +01:00
parent b944283354
commit 0597ff109e
2 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -119,9 +119,9 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
public Object getScriptedObject(ScriptSource scriptSource, Class<?>... actualInterfaces)
throws IOException, ScriptCompilationException {
try {
Class<?> clazz;
Class<?> clazz;
try {
synchronized (this.scriptClassMonitor) {
boolean requiresScriptEvaluation = (this.wasModifiedForTypeCheck && this.scriptClass == null);
this.wasModifiedForTypeCheck = false;
@ -145,25 +145,31 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
}
clazz = this.scriptClass;
}
}
catch (EvalError ex) {
this.scriptClass = null;
throw new ScriptCompilationException(scriptSource, ex);
}
if (clazz != null) {
// A Class: We need to create an instance for every call.
try {
return clazz.newInstance();
}
catch (Throwable ex) {
throw new ScriptCompilationException(
scriptSource, "Could not instantiate script class: " + clazz.getName(), ex);
}
if (clazz != null) {
// A Class: We need to create an instance for every call.
try {
return clazz.newInstance();
}
else {
// Not a Class: We need to evaluate the script for every call.
catch (Throwable ex) {
throw new ScriptCompilationException(
scriptSource, "Could not instantiate script class: " + clazz.getName(), ex);
}
}
else {
// Not a Class: We need to evaluate the script for every call.
try {
return BshScriptUtils.createBshObject(
scriptSource.getScriptAsString(), actualInterfaces, this.beanClassLoader);
}
}
catch (EvalError ex) {
throw new ScriptCompilationException(scriptSource, ex);
catch (EvalError ex) {
throw new ScriptCompilationException(scriptSource, ex);
}
}
}
@ -171,8 +177,8 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
public Class<?> getScriptedObjectType(ScriptSource scriptSource)
throws IOException, ScriptCompilationException {
try {
synchronized (this.scriptClassMonitor) {
synchronized (this.scriptClassMonitor) {
try {
if (scriptSource.isModified()) {
// New script content: Let's check whether it evaluates to a Class.
this.wasModifiedForTypeCheck = true;
@ -181,9 +187,10 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
}
return this.scriptClass;
}
}
catch (EvalError ex) {
throw new ScriptCompilationException(scriptSource, ex);
catch (EvalError ex) {
this.scriptClass = null;
throw new ScriptCompilationException(scriptSource, ex);
}
}
}

36
spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -158,10 +158,9 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
public Object getScriptedObject(ScriptSource scriptSource, Class<?>... actualInterfaces)
throws IOException, ScriptCompilationException {
try {
Class<?> scriptClassToExecute;
synchronized (this.scriptClassMonitor) {
synchronized (this.scriptClassMonitor) {
try {
Class<?> scriptClassToExecute;
this.wasModifiedForTypeCheck = false;
if (this.cachedResult != null) {
@ -186,13 +185,15 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
}
}
scriptClassToExecute = this.scriptClass;
}
// Process re-execution outside of the synchronized block.
return executeScript(scriptSource, scriptClassToExecute);
}
catch (CompilationFailedException ex) {
throw new ScriptCompilationException(scriptSource, ex);
// Process re-execution outside of the synchronized block.
return executeScript(scriptSource, scriptClassToExecute);
}
catch (CompilationFailedException ex) {
this.scriptClass = null;
this.scriptResultClass = null;
throw new ScriptCompilationException(scriptSource, ex);
}
}
}
@ -200,8 +201,8 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
public Class<?> getScriptedObjectType(ScriptSource scriptSource)
throws IOException, ScriptCompilationException {
try {
synchronized (this.scriptClassMonitor) {
synchronized (this.scriptClassMonitor) {
try {
if (this.scriptClass == null || scriptSource.isModified()) {
// New script content...
this.wasModifiedForTypeCheck = true;
@ -220,9 +221,12 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
}
return this.scriptResultClass;
}
}
catch (CompilationFailedException ex) {
throw new ScriptCompilationException(scriptSource, ex);
catch (CompilationFailedException ex) {
this.scriptClass = null;
this.scriptResultClass = null;
this.cachedResult = null;
throw new ScriptCompilationException(scriptSource, ex);
}
}
}