Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Feb 14, 2023 · bc117b6 · bc117b6
2 parents 5813a34 + be8bf11
commit bc117b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...va/com/evolveum/midpoint/model/impl/lens/projector/policy/ObjectPolicyRulesEvaluator.java b/...va/com/evolveum/midpoint/model/impl/lens/projector/policy/ObjectPolicyRulesEvaluator.java
@@ -72,7 +72,7 @@ void evaluate(OperationResult result)
                 LOGGER.trace("Rule {} is not applicable to the focus/projection, skipping: {}", rule.getName(), rule);
             }
         }
-        elementContext.setObjectPolicyRules(rules);
+        elementContext.setObjectPolicyRules(applicableRules);
         return applicableRules;
     }
 

diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
@@ -588,7 +588,7 @@ public void test300DrakeChangeEmployeeType() throws Exception {
                 .asObjectDelta(USER_DRAKE_OID);
 
         RecordingProgressListener recordingListener = new RecordingProgressListener();
-        modelService.executeChanges(Collections.singletonList(delta), null, task, Collections.singleton(recordingListener), result);
+        modelService.executeChanges(List.of(delta), null, task, List.of(recordingListener), result);
 
         // THEN
         then();