Skip to content

Commit f9967e1

Browse files
committed
AbstractScriptLanguage: avoid NPE on Name
Add a check for a null Info, in case a ScriptLanguage is unannotated.
1 parent 9aaf422 commit f9967e1

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import javax.script.ScriptEngineFactory;
3939

4040
import org.scijava.plugin.AbstractRichPlugin;
41+
import org.scijava.plugin.PluginInfo;
4142
import org.scijava.util.VersionUtils;
4243

4344
/**
@@ -106,7 +107,9 @@ public String getEngineName() {
106107

107108
@Override
108109
public String getLanguageName() {
109-
final String name = getInfo().getName();
110+
String name = null;
111+
final PluginInfo<?> info = getInfo();
112+
if (info != null) name = info.getName();
110113
return name != null && !name.isEmpty() ? name : inferNameFromClassName();
111114
}
112115

0 commit comments

Comments
 (0)