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

Fix context being re-used for next execution (#2760) 

Trigger information is inserted in the execution context. This information is changed to the new information each time the context is updated with the same keys. If the context of the next execution does not contain values for each key, the old key is re-used, leading e.g. to wrong event information in the context.

The solution is to re-set the individual context after each execution.

Signed-off-by: Jan N. Klug <github@klug.nrw>
pull/2778/head
J-N-K 2022-02-17 20:32:58 +01:00 committed by GitHub
parent 44da7a4e0e
commit 69069270a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
View File

@ -101,11 +101,11 @@ public abstract class AbstractScriptModuleHandler<T extends Module> extends Base
}
/**
* Adds the passed context variables of the rule engine to the context scope of the ScriptEngine, this should be
* updated each time the module is executed
* Adds the passed context variables of the rule engine to the context scope of the ScriptEngine
* this should be done each time the module is executed to prevent leaking context to later executions
*
* @param engine the script engine that is used
* @param context the variables and types to put into the execution context
* @param context the variables and types to remove from the execution context
*/
protected void setExecutionContext(ScriptEngine engine, Map<String, ?> context) {
ScriptContext executionContext = engine.getContext();
@ -130,4 +130,25 @@ public abstract class AbstractScriptModuleHandler<T extends Module> extends Base
executionContext.setAttribute(key, value, ScriptContext.ENGINE_SCOPE);
}
}
/**
* Removes passed context variables of the rule engine from the context scope of the ScriptEngine, this should be
* updated each time the module is executed
*
* @param engine the script engine that is used
* @param context the variables and types to put into the execution context
*/
protected void resetExecutionContext(ScriptEngine engine, Map<String, ?> context) {
ScriptContext executionContext = engine.getContext();
for (Entry<String, ?> entry : context.entrySet()) {
Object value = entry.getValue();
String key = entry.getKey();
int dotIndex = key.indexOf('.');
if (dotIndex != -1) {
key = key.substring(dotIndex + 1);
}
executionContext.removeAttribute(key, ScriptContext.ENGINE_SCOPE);
}
}
}

1
bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/ScriptActionHandler.java
View File

@ -65,6 +65,7 @@ public class ScriptActionHandler extends AbstractScriptModuleHandler<Action> imp
logger.error("Script execution of rule with UID '{}' failed: {}", ruleUID, e.getMessage(),
logger.isDebugEnabled() ? e : null);
}
resetExecutionContext(scriptEngine, context);
});
return resultMap;