diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2021-10-12 12:20:17 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2021-10-12 12:20:17 +0200 |
| commit | fafd628f525edce31dc7c35a7576393b4787081b (patch) | |
| tree | e0bd8ae24f044563f33240ce4c0e071cbc149566 /config-model/src/main/java/com/yahoo/config | |
| parent | f889f5f3df5411901f549f1a7144ad0845e01103 (diff) | |
Don't try to copy files if just one config server
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java index daf426517b8..4ae9834b87f 100644 --- a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java +++ b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java @@ -77,7 +77,7 @@ public class AdminModel extends ConfigModel { @Override public void doBuild(AdminModel model, Element adminElement, ConfigModelContext modelContext) { - if (modelContext.getDeployState().isHosted()) { // admin v2 is used on hosted: Build a default V4 instead + if (modelContext.getDeployState().isHosted()) { // admin v4 is used on hosted: Build a default V4 instead new BuilderV4().doBuild(model, adminElement, modelContext); return; } @@ -87,6 +87,7 @@ public class AdminModel extends ConfigModel { properties.multitenant(), properties.configServerSpecs()); model.admin = domBuilder.build(modelContext.getDeployState(), parent, adminElement); + // TODO: Is required since other models depend on admin. if (parent instanceof ApplicationConfigProducerRoot) { ((ApplicationConfigProducerRoot)parent).setupAdmin(model.admin); @@ -109,7 +110,7 @@ public class AdminModel extends ConfigModel { @Override public void doBuild(AdminModel model, Element adminElement, ConfigModelContext modelContext) { - AbstractConfigProducer parent = modelContext.getParentProducer(); + AbstractConfigProducer<?> parent = modelContext.getParentProducer(); ModelContext.Properties properties = modelContext.getDeployState().getProperties(); DomAdminV4Builder domBuilder = new DomAdminV4Builder(modelContext, properties.multitenant(), |