diff options
author | gjoranv <gv@yahoo-inc.com> | 2017-02-18 04:05:01 +0100 |
---|---|---|
committer | gjoranv <gv@yahoo-inc.com> | 2017-02-19 01:39:52 +0100 |
commit | 84882add57bf0496f84abb307ee8d4c2b9cf17fa (patch) | |
tree | 1a05dbd3f71f328de415c0436b0c045af725270a /config-model | |
parent | 805900f58e9428a0502f63e93181db009bf0bd07 (diff) |
Rename variables to avoid confusion.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java index d653bae9d53..0dfdebbb58f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java @@ -156,12 +156,12 @@ public class HostSystem extends AbstractConfigProducer<Host> { List<HostSpec> allocatedHosts = provisioner.prepare(cluster, capacity, groups, new ProvisionDeployLogger(logger)); // TODO: Let hostresource own a set of memberships, but we still need the map here because the caller needs the current membership. Map<HostResource, ClusterMembership> retAllocatedHosts = new LinkedHashMap<>(); - for (HostSpec host : allocatedHosts) { + for (HostSpec spec : allocatedHosts) { // This is needed for single node host provisioner to work in unit tests for hosted vespa applications. - HostResource hostResource = getExistingHost(host).orElseGet(() -> addNewHost(host)); - retAllocatedHosts.put(hostResource, host.membership().orElse(null)); - if (! hostResource.getFlavor().isPresent()) - hostResource.setFlavor(host.flavor()); + HostResource host = getExistingHost(spec).orElseGet(() -> addNewHost(spec)); + retAllocatedHosts.put(host, spec.membership().orElse(null)); + if (! host.getFlavor().isPresent()) + host.setFlavor(spec.flavor()); } return retAllocatedHosts; } |