summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-05-04 09:15:15 +0200
committerJon Marius Venstad <venstad@gmail.com>2020-05-04 09:15:15 +0200
commit21e3e201b46ab3761e9bc4ec5e79bb8c3b7dfa81 (patch)
treece98f36089b85d7f74c8fd0462595821d6bcf058
parenta6217750dccda4506477eeef4f1defb282e88418 (diff)
Avoid Instant.MAX that is later serialised to epoch millis -> overflow
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java2
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.
}
}