Merge pull request #13141 from vespa-engine/jonmv/avoid-instant-max-in-value-that-could-be-serialised-to-millis

Avoid Instant.MAX that is later serialised to epoch millis -> overflow

1 files changed, 1 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
index da1bcbdab54..3d5a181b987 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
@@ -492,7 +492,7 @@ public class DeploymentStatus {
                 if ( ! blocked)
                     return current == now ? Optional.empty() : Optional.of(current);
             }
-            return Optional.of(Instant.MAX);
+            return Optional.of(now.plusSeconds(1 << 30)); // Some time in the future that doesn't look like anything you'd expect.
         }
 
     }