Bug 550051: Engine termination should be improved
do not report a Job error status for script terminations and 'normal'
script errors. This results in a nasty popup which the user has to
deal with.
Change-Id: Ia25168657c373c7ad56e769faebc1441ad80ce0c
diff --git a/plugins/org.eclipse.ease/src/org/eclipse/ease/AbstractScriptEngine.java b/plugins/org.eclipse.ease/src/org/eclipse/ease/AbstractScriptEngine.java
index 2322217..9cef8de 100644
--- a/plugins/org.eclipse.ease/src/org/eclipse/ease/AbstractScriptEngine.java
+++ b/plugins/org.eclipse.ease/src/org/eclipse/ease/AbstractScriptEngine.java
@@ -272,9 +272,7 @@
// execute code
if (!fScheduledScripts.isEmpty()) {
final Script piece = fScheduledScripts.remove(0);
- final ScriptResult scriptResult = inject(piece, true, false);
- if (scriptResult.hasException())
- returnStatus = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Script execution failed", scriptResult.getException());
+ inject(piece, true, false);
} else {
synchronized (this) {
@@ -288,7 +286,7 @@
}
}
- if ((Status.OK_STATUS.equals(returnStatus)) && (getMonitor().isCanceled()))
+ if (getMonitor().isCanceled())
returnStatus = Status.CANCEL_STATUS;
return cleanupRun(returnStatus);
