Insert context keys before compiling UI scripts

Signed-off-by: Jimmy Tanagra <[email protected]>
openhab · Sep 9, 2024 · a04ec40 · a04ec40
1 parent 1145613
commit a04ec40
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...g/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java b/...g/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
@@ -105,6 +105,7 @@ protected void compileScript() throws ScriptException {
             ScriptEngine scriptEngine = engine.get();
             if (scriptEngine instanceof Compilable) {
                 logger.debug("Pre-compiling script of rule with UID '{}'", ruleUID);
+                setExecutionContext(scriptEngine, Map.of()); // JRuby script engine needs this before compiling
                 compiledScript = Optional.ofNullable(((Compilable) scriptEngine).compile(script));
             }
         }
@@ -211,7 +212,7 @@ protected void resetExecutionContext(ScriptEngine engine, Map<String, ?> context
         try {
             if (compiledScript.isPresent()) {
                 logger.debug("Executing pre-compiled script of rule with UID '{}'", ruleUID);
-                return compiledScript.get().eval(engine.getContext());
+                return compiledScript.get().eval();
             }
             logger.debug("Executing script of rule with UID '{}'", ruleUID);
             return engine.eval(script);