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

Evolveum · Mar 13, 2023 · e71e18b · e71e18b
2 parents 06878ac + e6f193e
commit e71e18b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.../main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java b/.../main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
@@ -1059,7 +1059,9 @@ private void addAssignmentPathValueMetadataValues(PrismReferenceValue roleRef,
             AssignmentType assignment = evaluatedAssignment.getAssignment();
             ObjectReferenceType assignmentTargetRef = assignment.getTargetRef();
             // We can get here with roleRef->X and assignment/targetRef->Y, in which case we do nothing.
-            if (assignmentTargetRef.getOid().equals(roleRef.getOid())
+            if (assignmentTargetRef != null
+                    // assignmentTargetRef.getOid can be null?! e.g. during TestAssignmentApprovalGlobal#initSystem
+                    && roleRef.getOid().equals(assignmentTargetRef.getOid())
                     && QNameUtil.match(assignmentTargetRef.getRelation(), roleRef.getRelation())) {
                 addAssignmentPathValueMetadataValue(roleRef, evaluatedAssignment,
                         new AssignmentPathType().segment(new AssignmentPathSegmentType()