Author: ate
Date: Thu Jan 30 20:15:20 2014
New Revision: 1562943
URL: http://svn.apache.org/r1562943
Log:
SCXML-186: fix setting up Groovy initialScript as scriptBaseClass after
resetting the SCXMLExecutor (or using a new one)
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluator.java
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluator.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluator.java?rev=1562943&r1=1562942&r2=1562943&view=diff
==============================================================================
---
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluator.java
(original)
+++
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluator.java
Thu Jan 30 20:15:20 2014
@@ -229,7 +229,7 @@ public class GroovyEvaluator implements
effective.setEvaluatingLocation(true);
boolean isInitialScript = groovyCtx.getParent() != null &&
groovyCtx.getParent().getParent() == null &&
- scriptCache.isEmpty();
+ groovyCtx.getScriptBaseClass() == null;
Script script = getScript(effective,
groovyCtx.getScriptBaseClass(), scriptSource);
Object result = script.run();
if (isInitialScript && useInitialScriptAsBaseScript) {
