OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed NPE in ScriptError if INode is empty (#1985) 

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
pull/1992/head
Christoph Weitkamp 2020-12-22 20:34:49 +01:00 committed by GitHub
parent bf14e1077f
commit 7ce96ac06a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java
View File

@ -62,10 +62,16 @@ public final class ScriptError {
public ScriptError(final String message, final EObject atEObject) {
this.message = message;
INode node = NodeModelUtils.getNode(atEObject);
LineAndColumn lac = NodeModelUtils.getLineAndColumn(node, node.getOffset());
this.line = lac.getLine();
this.column = lac.getColumn();
this.length = node.getEndOffset() - node.getOffset();
if (node == null) {
this.line = 0;
this.column = 0;
this.length = -1;
} else {
LineAndColumn lac = NodeModelUtils.getLineAndColumn(node, node.getOffset());
this.line = lac.getLine();
this.column = lac.getColumn();
this.length = node.getEndOffset() - node.getOffset();
}
}
/**