Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Insert context keys before compiling UI scripts #4372

Merged
merged 1 commit into from
Sep 9, 2024
+2 −1
Merged

Insert context keys before compiling UI scripts #4372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...g/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
View file
Original file line number Diff line number Diff line change
@@ -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();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had this line that way because what if eval is called with a different ScriptEngine?
Of course this should not happen at all because where should the child classes of AbstractScriptModuleHandler get a different ScriptEngine from, but given the method signature it would be possible.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI just thinking about that, I’m fine with that change.

}
logger.debug("Executing script of rule with UID '{}'", ruleUID);
return engine.eval(script);