Add null check for common schema manager

flowable · Aug 20, 2024 · f85122d · f85122d
1 parent 0ae1701
commit f85122d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineBuild.java b/...-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineBuild.java
@@ -55,6 +55,9 @@ public Void execute(CommandContext commandContext) {
         String databaseSchemaUpdate = schemaOperation == null ? engineConfiguration.getDatabaseSchemaUpdate() : schemaOperation;
         List<SchemaManager> schemaManagers = new ArrayList<>();
         schemaManagers.add(engineConfiguration.getCommonSchemaManager());
+        if (engineConfiguration.getCommonSchemaManager() != null) {
+        	schemaManagers.add(engineConfiguration.getCommonSchemaManager());
+        }
         schemaManagers.add(engineConfiguration.getSchemaManager());
 
         Map<String, SchemaManager> additionalSchemaManagers = engineConfiguration.getAdditionalSchemaManagers();