aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-08-10 15:23:54 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2016-08-10 15:23:54 +0200
commit27df26bf65450122b68a9c8fc4a46d2c727df805 (patch)
tree329865f92f14c98dbe4730e8c42042a9a391641e /config-model
parent18a7c06bb20ff38ef9d6254e6707eedf6f730e02 (diff)
Minor nonfunctional changes
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java b/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
index 37da769ae33..15068eceaf9 100644
--- a/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
@@ -48,7 +48,7 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst
public abstract void doBuild(MODEL model, Element spec, ConfigModelContext modelContext);
/**
- * Builds a standalone instance of this component model.
+ * Builds an instance of this component model.
* This calls instantiate(...), instance.setUp(...), doBuild(instance, ...).
*
* @param deployState a global deployment state used for this model.
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index ae42da60df0..965b221c61f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -399,7 +399,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
if (nodesElement.hasAttribute("count"))
return createNodesFromNodeCount(cluster, nodesElement);
else if (nodesElement.hasAttribute("of"))
- return createNodesFromClusterReference(cluster, nodesElement, context);
+ return createNodesFromContentClusterReference(cluster, nodesElement, context);
else // the non-hosted option
return createNodesFromNodeList(cluster, nodesElement);
}
@@ -434,7 +434,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
return createNodesFromHosts(hosts, cluster);
}
- private List<Container> createNodesFromClusterReference(ContainerCluster cluster, Element nodesElement, ConfigModelContext context) {
+ private List<Container> createNodesFromContentClusterReference(ContainerCluster cluster, Element nodesElement, ConfigModelContext context) {
// Resolve references to content clusters at the XML level because content clusters must be built after container clusters
String referenceId = nodesElement.getAttribute("of");
Element services = servicesRootOf(nodesElement).orElseThrow(() -> clusterReferenceNotFoundException(cluster, referenceId));