Fixed condition

2 files changed, 4 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobStatus.java
index a878a6afe61..ceb04d88026 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobStatus.java
@@ -102,7 +102,9 @@ public class JobStatus {
     public DeploymentJobs.JobType type() { return type; }
 
     /** Returns true unless this job last completed with a failure */
-    public boolean isSuccess() { return ! jobError.isPresent(); }
+    public boolean isSuccess() {
+        return lastCompleted().isPresent() && ! jobError.isPresent();
+    }
     
     /** Returns true if last triggered is newer than last completed and was started after timeoutLimit */
     public boolean isRunning(Instant timeoutLimit) {
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 adb11f681d1..06b62b6bcee 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
@@ -305,6 +305,7 @@ public class DeploymentTrigger {
     private boolean isFailing(Change change, JobStatus status) {
         return       status != null
                 && ! status.isSuccess()
+                &&   status.lastCompleted().isPresent()
                 &&   status.lastCompleted().get().lastCompletedWas(change);
     }