summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-06-12 15:28:51 +0200
committerMartin Polden <mpolden@mpolden.no>2019-06-12 15:28:51 +0200
commit5ed98ee3326e296aeddc083af8a7811bdee876b5 (patch)
treebd0b9c92f0bedf7822bc88def7a209e65a93a4e6 /configserver
parent242d8499101c84c016d8e6e0d05c381b302f3c63 (diff)
Fix log condition
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index ac061214f74..7af61a6efc1 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -238,11 +238,13 @@ public class SessionPreparer {
if (!params.containerEndpoints().isEmpty()) { // Use endpoints from parameter when explicitly given
containerEndpoints.write(applicationId, params.containerEndpoints());
} else { // Fall back to writing rotations as container endpoints
- if (globalServiceId.isEmpty()) {
- log.log(LogLevel.WARNING, "Want to write rotations " + rotationsSet + " as container endpoints, but " + applicationId + " has no global-service-id. This should not happen");
- return;
+ if (!rotationsSet.isEmpty()) {
+ if (globalServiceId.isEmpty()) {
+ log.log(LogLevel.WARNING, "Want to write rotations " + rotationsSet + " as container endpoints, but " + applicationId + " has no global-service-id. This should not happen");
+ return;
+ }
+ containerEndpoints.write(applicationId, toContainerEndpoints(globalServiceId.get(), rotationsSet));
}
- containerEndpoints.write(applicationId, toContainerEndpoints(globalServiceId.get(), rotationsSet));
}
checkTimeout("write container endpoints to zookeeper");
}