public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[jrubyscripting] Filter out empty require options (#12386) 

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng 2022-03-01 03:09:57 +10:00 committed by GitHub
parent 6c25e8b528
commit 166e4ec1b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyScriptEngineConfiguration.java
View File

@ -198,16 +198,16 @@ public class JRubyScriptEngineConfiguration {
return; return;
} }
String[] scripts = requireConfigElement.getValue().get().split(","); Stream.of(requireConfigElement.getValue().get().split(",")).map(s -> s.trim()).filter(s -> !s.isEmpty())
for (String script : scripts) { .forEach(script -> {
final String requireStatement = String.format("require '%s'", script.trim()); final String requireStatement = String.format("require '%s'", script);
try { try {
logger.trace("Injecting require statement: {}", requireStatement); logger.trace("Injecting require statement: {}", requireStatement);
engine.eval(requireStatement); engine.eval(requireStatement);
} catch (ScriptException e) { } catch (ScriptException e) {
logger.warn("Error evaluating statement {}: {}", requireStatement, e.getMessage()); logger.warn("Error evaluating statement {}: {}", requireStatement, e.getMessage());
} }
} });
} }
/** /**