From 71707bec11f8a9d47986cd6da7b5b739d9f755f9 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Wed, 15 Nov 2017 09:01:05 +0100 Subject: Avoid potential NPEs and fix a condition --- .../yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 78dc01fef19..7166a53071a 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 @@ -184,14 +184,14 @@ public class DeploymentTrigger { if ( ! application.deploying().isPresent()) return false; Change change = application.deploying().get(); - if ( ! previous.lastSuccess().isPresent() && + if ( ! previous.isSuccess() && ! productionUpgradeHasSucceededFor(previous, change)) return false; if (change instanceof Change.VersionChange) { Version targetVersion = ((Change.VersionChange)change).version(); if ( ! (targetVersion.equals(previous.lastSuccess().get().version())) ) return false; // version is outdated - if (isOnNewerVersionInProductionThan(targetVersion, application, next.type())) + if (next != null && isOnNewerVersionInProductionThan(targetVersion, application, next.type())) return false; // Don't downgrade } @@ -200,7 +200,7 @@ public class DeploymentTrigger { JobStatus.JobRun previousSuccess = previous.lastSuccess().get(); JobStatus.JobRun nextSuccess = next.lastSuccess().get(); - if (previousSuccess.revision().isPresent() && ! previousSuccess.revision().get().equals(nextSuccess.revision().get())) + if (previousSuccess.revision().isPresent() && ! previousSuccess.revision().equals(nextSuccess.revision())) return true; if ( ! previousSuccess.version().equals(nextSuccess.version())) return true; -- cgit v1.2.3