Double negation error >_<

3 files changed, 7 insertions, 7 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
index ffda9b7ddc2..748bf2c445f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
@@ -151,7 +151,7 @@ public class Application {
     /** Returns the version a new deployment to this zone should use for this application */
     public Version deployVersionIn(ZoneId zone, Controller controller) {
         Version current = versionIn(zone, controller);
-        return change.platform().filter(ignored -> change.downgrades(current)).orElse(current);
+        return change.platform().filter(ignored -> ! change.downgrades(current)).orElse(current);
     }
 
     /** Returns the current version this application has, or if none; should use, in the given zone */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
index 1dc7fd3951e..395e1f7fa07 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
@@ -97,22 +97,22 @@ public final class Change {
 
     /** Returns whether this change carries an application downgrade relative to the given version. */
     public boolean downgrades(ApplicationVersion version) {
-        return application.map(version::compareTo).orElse(0) < 0;
+        return application.map(version::compareTo).orElse(0) > 0;
     }
 
     /** Returns whether this change carries a platform downgrade relative to the given version. */
     public boolean downgrades(Version version) {
-        return platform.map(version::compareTo).orElse(0) < 0;
+        return platform.map(version::compareTo).orElse(0) > 0;
     }
 
     /** Returns whether this change carries an application upgrade relative to the given version. */
     public boolean upgrades(ApplicationVersion version) {
-        return application.map(version::compareTo).orElse(0) > 0;
+        return application.map(version::compareTo).orElse(0) < 0;
     }
 
     /** Returns whether this change carries a platform upgrade relative to the given version. */
     public boolean upgrades(Version version) {
-        return platform.map(version::compareTo).orElse(0) > 0;
+        return platform.map(version::compareTo).orElse(0) < 0;
     }
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 5bad3d6af53..d0296ca38c1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -269,9 +269,9 @@ public class DeploymentTrigger {
 
         Deployment deployment = application.deployments().get(jobType.zone(controller.system()).get());
         return Optional.ofNullable(deployment).map(Deployment::at)
-                       .filter(ignored ->      (   application.change().upgrades(deployment.version())
+                       .filter(ignored ->    ! (   application.change().upgrades(deployment.version())
                                                 || application.change().upgrades(deployment.applicationVersion()))
-                                          && ! (   application.change().downgrades(deployment.version())
+                                          &&   (   application.change().downgrades(deployment.version())
                                                 || application.change().downgrades(deployment.applicationVersion())));
     }