diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-11-11 16:38:05 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-11-11 16:38:05 +0100 |
commit | e8b5a1759630a90e0bf825fc9e613a7bddac80f1 (patch) | |
tree | f4ece17a0432daee707851a79a94ce2318346d48 /config-model | |
parent | f19bd859036b2adaba57b9561cb21ae43d8e0d9a (diff) |
Nonfunctional changes only
Diffstat (limited to 'config-model')
-rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index b535bec7f4e..11ad6b30053 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -360,12 +360,9 @@ public final class ContainerCluster } private Optional<String> getGlobalServiceId() { - Optional<String> globalServiceId = Optional.empty(); Optional<DeploymentSpec> deploymentSpec = getDeploymentSpec(); - if (deploymentSpec.isPresent()) { - globalServiceId = deploymentSpec.get().globalServiceId(); - } - return globalServiceId; + if (deploymentSpec.isPresent()) return deploymentSpec.get().globalServiceId(); + return Optional.empty(); } private Set<Rotation> getRotations() { @@ -403,7 +400,7 @@ public final class ContainerCluster } private void setRotations(Container container, Set<Rotation> rotations, Optional<String> globalServiceId, String containerClusterName) { - if (!rotations.isEmpty() && globalServiceId.isPresent()) { + if ( ! rotations.isEmpty() && globalServiceId.isPresent()) { if (containerClusterName.equals(globalServiceId.get())) { container.setProp("rotations", rotations.stream().map(Rotation::getId).collect(Collectors.joining(","))); } |