From 9d3569b1b4127b8f2291accd0082cd95499a0db3 Mon Sep 17 00:00:00 2001 From: eschleb Date: Wed, 23 Oct 2024 10:14:39 +0200 Subject: [PATCH] Fix install and update task mapping --- .../oss/magnolia/setup/EnhancedModuleVersionHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/merkle/oss/magnolia/setup/EnhancedModuleVersionHandler.java b/core/src/main/java/com/merkle/oss/magnolia/setup/EnhancedModuleVersionHandler.java index 9038c9a..277c28d 100644 --- a/core/src/main/java/com/merkle/oss/magnolia/setup/EnhancedModuleVersionHandler.java +++ b/core/src/main/java/com/merkle/oss/magnolia/setup/EnhancedModuleVersionHandler.java @@ -70,8 +70,8 @@ private Delta getInstallAndUpdateTasksDelta(final InstallContext installContext, return DeltaBuilder.install(forVersion, "setup-task install and update").addTasks(Stream.of( isInstall ? getInstallTasks(installContext, forVersion) : Stream.empty(), - isUpdate ? getInstallAndUpdateTasks(installContext, forVersion, null) : Stream.empty(), - (isInstall || isUpdate)? getUpdateTasks(installContext, forVersion, versionFrom) : Stream.empty() + isUpdate ? getUpdateTasks(installContext, forVersion, versionFrom) : Stream.empty(), + (isInstall || isUpdate)? getInstallAndUpdateTasks(installContext, forVersion, versionFrom) : Stream.empty() ).flatMap(Function.identity()).sorted(new DepdendsOnComparator()).toList()); }