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

Evolveum · Apr 16, 2020 · 3f0c3ac · 3f0c3ac
2 parents 9e2d304 + 77a55c8
commit 3f0c3ac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
@@ -102,7 +102,7 @@ public class ChangeExecutor {
     private static final String OPERATION_UPDATE_SITUATION_IN_SHADOW = ChangeExecutor.class.getName() + ".updateSituationInShadow";
 
     @Autowired private TaskManager taskManager;
-    @Autowired private WorkflowManager workflowManager;
+    @Autowired(required = false) private WorkflowManager workflowManager; // not available e.g. during tests
     @Autowired @Qualifier("cacheRepositoryService") private transient RepositoryService cacheRepositoryService;
     @Autowired private ProvisioningService provisioning;
     @Autowired private PrismContext prismContext;
@@ -1420,7 +1420,7 @@ private <T extends ObjectType, F extends ObjectType> PrismObject<T> executeDelet
                 taskManager.deleteTask(oid, result);
             } else if (NodeType.class.isAssignableFrom(objectTypeClass)) {
                 taskManager.deleteNode(oid, result);
-            } else if (CaseType.class.isAssignableFrom(objectTypeClass)) {
+            } else if (workflowManager != null && CaseType.class.isAssignableFrom(objectTypeClass)) {
                 workflowManager.deleteCase(oid, task, result);
             } else if (ObjectTypes.isClassManagedByProvisioning(objectTypeClass)) {
                 ProvisioningOperationOptions provisioningOptions = getProvisioningOptions(context, options,