summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2017-10-18 09:45:30 +0200
committerGitHub <noreply@github.com>2017-10-18 09:45:30 +0200
commit59f4f33244a22794441f3dcc0df19956b9f6c586 (patch)
tree4f7eb836ed64a62245046e031dcb295500ec08c9 /controller-server
parentc9f988cec83eb79148dd6236911dc8013cb6b7e2 (diff)
As requested.
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
index 7d645fa046e..ea95a557d6b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
@@ -40,7 +40,7 @@ public class DeploymentMetricsMaintainer extends Maintainer {
try (Lock lock = controller().applications().lock(application.id())) {
// Deployment or application may have changed (or be gone) now:
- application = controller().applications().require(application.id());
+ application = controller().applications().get(application.id()).orElse(null);
if (application == null)
break;
@@ -52,7 +52,7 @@ public class DeploymentMetricsMaintainer extends Maintainer {
}
}
catch (UncheckedIOException e) {
- log.log(Level.WARNING, "Timed out talking to YAMAS; retrying in " + maintenanceInterval() + ":\n", e);
+ log.log(Level.WARNING, "Timed out talking to YAMAS; retrying in " + maintenanceInterval(), e);
}
}
}