Skip to content

Commit 10d8be7

Browse files
committed
ScriptModule: guard against null conditions
If a language isn't available to run the given script, say so.
1 parent 0a7ad5a commit 10d8be7

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/main/java/org/scijava/script/ScriptModule.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,16 @@ public void setErrorWriter(final Writer error) {
102102
/** Gets the script engine used to execute the script. */
103103
public ScriptEngine getEngine() {
104104
if (scriptEngine == null) {
105-
scriptEngine = getInfo().getLanguage().getScriptEngine();
105+
final ScriptInfo scriptInfo = getInfo();
106+
if (scriptInfo == null) {
107+
throw new IllegalArgumentException("Invalid script");
108+
}
109+
final ScriptLanguage scriptLang = scriptInfo.getLanguage();
110+
if (scriptLang == null) {
111+
throw new IllegalArgumentException(
112+
"No compatible script language available");
113+
}
114+
scriptEngine = scriptLang.getScriptEngine();
106115
}
107116
return scriptEngine;
108117
}

0 commit comments

Comments
 (0)