Update src/main/java/dev/openfeature/sdk/OpenFeatureClient.java

ssharaev · Kavindu-Dodan · web-flow · commit 6197d712f734 · 2024-03-20T19:14:39.000+04:00
Co-authored-by: Kavindu Dodanduwa &lt;Kavindu-Dodan@users.noreply.github.com&gt;
Signed-off-by: Sviatoslav Sharaev &lt;sviatoslav.sharaev@gmail.com&gt;
diff --git a/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java b/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java
@@ -164,9 +164,7 @@ private EvaluationContext mergeEvaluationContext(
                 ? openfeatureApi.getTransactionContext()
                 : new ImmutableContext();
 
-        EvaluationContext mergedInvocationCtx = invocationContext.merge(hookContext);
-
-        return apiContext.merge(transactionContext.merge(clientContext.merge(mergedInvocationCtx)));
+  return apiContext.merge(transactionContext.merge(clientContext.merge(invocationContext.merge(hookContext))));
     }
 
     private <T> ProviderEvaluation<?> createProviderEvaluation(

Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,7 @@ private EvaluationContext mergeEvaluationContext(`
`164`	`164`	`? openfeatureApi.getTransactionContext()`
`165`	`165`	`: new ImmutableContext();`
`166`	`166`
`167`		`- EvaluationContext mergedInvocationCtx = invocationContext.merge(hookContext);`
`168`		`-`
`169`		`- return apiContext.merge(transactionContext.merge(clientContext.merge(mergedInvocationCtx)));`
	`167`	`+ return apiContext.merge(transactionContext.merge(clientContext.merge(invocationContext.merge(hookContext))));`
`170`	`168`	`}`
`171`	`169`
`172`	`170`	`private <T> ProviderEvaluation<?> createProviderEvaluation(`