Merge branch 'support-4.0' of https://github.com/Evolveum/midpoint in…

…to support-4.0
Evolveum · Nov 8, 2019 · 825d72e · 825d72e
2 parents 12d4dba + ba54ce0
commit 825d72e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java b/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
@@ -273,7 +273,9 @@ private <O extends ObjectType> void applySchemasAndSecurityFocus(LensContext<O>
     private <O extends ObjectType> void applySchemasAndSecurityProjections(LensContext<O> context,
             AuthorizationPhaseType phase, Task task, OperationResult result) throws SecurityViolationException, SchemaException, ConfigurationException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException {
         for (LensProjectionContext projCtx : context.getProjectionContexts()) {
-            applySchemasAndSecurityElementContext(context, projCtx, phase, task, result);
+            if (projCtx != null && projCtx.getObjectAny() != null) {
+                applySchemasAndSecurityElementContext(context, projCtx, phase, task, result);
+            }
         }
     }