]> git.basschouten.com Git - openhab-addons.git/commitdiff
[jrubyscripting] Filter out empty require options (#12386)
authorjimtng <2554958+jimtng@users.noreply.github.com>
Mon, 28 Feb 2022 17:09:57 +0000 (03:09 +1000)
committerGitHub <noreply@github.com>
Mon, 28 Feb 2022 17:09:57 +0000 (18:09 +0100)
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyScriptEngineConfiguration.java

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