[midPoint-git] [Evolveum/midpoint] 11625b: Fix working with ScriptExpressionEvaluationContext
mederly
noreply at github.com
Mon Mar 30 18:24:31 CEST 2020
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 11625b9ed5b1f0cc28253305fbc691af65920b59
https://github.com/Evolveum/midpoint/commit/11625b9ed5b1f0cc28253305fbc691af65920b59
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-03-30 (Mon, 30 Mar 2020)
Changed paths:
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/CustomFunctions.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluationContext.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionFactory.java
M model/model-intest/src/test/resources/mapping/resource-dummy-custom-function-crimson.xml
Log Message:
-----------
Fix working with ScriptExpressionEvaluationContext
The thread-local instance of this context was set up and teared down
with no regards for re-entrance. This caused problems with scripts
that called custom functions more than once: the context went away,
falling back to initialization-time operation result, which is obviously
wrong.
So we removed the fallback (now will fail immediately if no context
is present) and fixed the re-entrance treatment.
This should resolve MID-6145.
Commit: 9b9aaad0f861089ff6dcd789e70198027a105dc7
https://github.com/Evolveum/midpoint/commit/9b9aaad0f861089ff6dcd789e70198027a105dc7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-03-30 (Mon, 30 Mar 2020)
Changed paths:
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/UsersTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/6edaec211219...9b9aaad0f861
More information about the midPoint-svn
mailing list