NPE fix

Evolveum · Aug 30, 2021 · 9a37507 · 9a37507
1 parent 1126036
commit 9a37507
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/ArchetypeManager.java b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/ArchetypeManager.java
@@ -174,7 +174,19 @@ public <O extends ObjectType> ArchetypePolicyType determineArchetypePolicy(Prism
         if (object == null) {
             return null;
         }
+
+        ArchetypePolicyType archetypePolicyType = computeArchetypePolicy(object, result);
+        // Try to find appropriate system configuration section for this object.
+        ObjectPolicyConfigurationType objectPolicy = determineObjectPolicyConfiguration(object, result);
+
+        return merge(archetypePolicyType, objectPolicy);
+    }
+
+    private <O extends ObjectType> ArchetypePolicyType computeArchetypePolicy(PrismObject<O> object, OperationResult result) throws SchemaException {
         @SuppressWarnings("unchecked") List<PrismObject<ArchetypeType>> archetypes = determineArchetypes((PrismObject<? extends AssignmentHolderType>) object, result);
+        if (archetypes == null) {
+            return null;
+        }
 
         PrismObject<ArchetypeType> structuralArchetype = ArchetypeTypeUtil.getStructuralArchetype(archetypes);
 
@@ -192,12 +204,7 @@ public <O extends ObjectType> ArchetypePolicyType determineArchetypePolicy(Prism
 
         ArchetypePolicyType structuralArchetypePolicy = mergeArchetypePolicies(structuralArchetype, result);
 
-        ArchetypePolicyType structuredAndAuxiliaryArchetypePolicy = mergeArchetypePolicies(mergedAuxiliaryArchetypePolicy, structuralArchetypePolicy);
-
-        // Try to find appropriate system configuration section for this object.
-        ObjectPolicyConfigurationType objectPolicy = determineObjectPolicyConfiguration(object, result);
-
-        return merge(structuredAndAuxiliaryArchetypePolicy, objectPolicy);
+        return mergeArchetypePolicies(mergedAuxiliaryArchetypePolicy, structuralArchetypePolicy);
     }
 
     public ArchetypePolicyType mergeArchetypePolicies(PrismObject<ArchetypeType> archetype, OperationResult result) throws SchemaException {