Skip to content

Commit b8ee376

Browse files
authored
Merge pull request #1116 from camunda/backport-1108-to-1.18
[Backport 1.18] perf: revert rootContext to val for performance optimization
2 parents ab62e71 + 950cd99 commit b8ee376

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/main/scala/org/camunda/feel/FeelEngine.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class FeelEngine(
133133
s"configuration: $configuration]"
134134
)
135135

136-
private def rootContext(): EvalContext = EvalContext.create(
136+
private val rootContext: EvalContext = EvalContext.create(
137137
valueMapper = valueMapper,
138138
functionProvider = FunctionProvider.CompositeFunctionProvider(
139139
List(
@@ -330,7 +330,8 @@ class FeelEngine(
330330
@deprecated def evaluate(expression: ParsedExpression, context: Context): EvaluationResult =
331331
Try {
332332
validate(expression) match {
333-
case Right(_) => eval(expression, rootContext().merge(context))
333+
case Right(_) =>
334+
eval(expression, EvalContext.empty(valueMapper).merge(rootContext).merge(context))
334335
case Left(failure) => FailedEvaluationResult(failure = failure)
335336
}
336337
}.recover(failure =>

0 commit comments

Comments
 (0)