MID-9164 fixed incorrect warnings in pre-upgrade-check action

(cherry picked from commit 953707d)
Evolveum · Oct 4, 2023 · 6d6d6c3 · 6d6d6c3
1 parent ea0370f
commit 6d6d6c3
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/ninja/action/upgrade/action/PreUpgradeCheckAction.java b/...rc/main/java/com/evolveum/midpoint/ninja/action/upgrade/action/PreUpgradeCheckAction.java
@@ -48,14 +48,18 @@ public ActionResult<Boolean> execute() throws Exception {
             return new ActionResult<>(false, 1);
         }
 
-        if (!options.isSkipNodesVersionCheck() && !checkNodesVersion(repository)) {
-            return new ActionResult<>(false, 2);
+        if (!options.isSkipNodesVersionCheck()) {
+            if (!checkNodesVersion(repository)) {
+                return new ActionResult<>(false, 2);
+            }
         } else {
             log.warn("Skipping nodes version check");
         }
 
-        if (!options.isSkipDatabaseVersionCheck() && !checkDatabaseSchemaVersion(repository)) {
-            return new ActionResult<>(false, 3);
+        if (!options.isSkipDatabaseVersionCheck()) {
+            if (!checkDatabaseSchemaVersion(repository)) {
+                return new ActionResult<>(false, 3);
+            }
         } else {
             log.warn("Skipping database schema version check");
         }