diff options
Diffstat (limited to 'config-model/src/main')
4 files changed, 6 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java index 45deb97cb44..5e49331e6ea 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java @@ -19,7 +19,7 @@ public class LogserverContainerCluster extends ContainerCluster<LogserverContain } @Override - protected void myPrepare(DeployState deployState) { } + protected void doPrepare(DeployState deployState) { } private void addLogHandler() { Handler<?> logHandler = Handler.fromClassName(ContainerCluster.LOG_HANDLER_CLASS); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java index adc6c7d5ec3..277335fc3ea 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java @@ -25,6 +25,6 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC } @Override - protected void myPrepare(DeployState deployState) { } + protected void doPrepare(DeployState deployState) { } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index e8b4e8f505c..50d6f24b8fc 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -56,7 +56,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat addSimpleComponent("com.yahoo.jdisc.http.filter.SecurityFilterInvoker"); } - protected void myPrepare(DeployState deployState) { + @Override + protected void doPrepare(DeployState deployState) { addAndSendApplicationBundles(deployState); if (modelEvaluation != null) modelEvaluation.prepare(containers); 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 dc4c5333fa4..e61c1226968 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 @@ -292,10 +292,10 @@ public abstract class ContainerCluster<CONTAINER extends Container> public void prepare(DeployState deployState) { applicationMetaData = deployState.getApplicationPackage().getMetaData(); - myPrepare(deployState); + doPrepare(deployState); } - protected abstract void myPrepare(DeployState deployState); + protected abstract void doPrepare(DeployState deployState); public void addMbusServer(ComponentId chainId) { ComponentId serviceId = chainId.nestInNamespace(ComponentId.fromString("MbusServer")); |