diff options
Diffstat (limited to 'container-core')
2 files changed, 6 insertions, 6 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java b/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java index 8b75e2d7660..97a19d0dbe5 100644 --- a/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java +++ b/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java @@ -22,10 +22,10 @@ public class DocumentAccessProvider extends AbstractComponent implements Provide @Inject public DocumentAccessProvider(DocumentmanagerConfig documentmanagerConfig, LoadTypeConfig loadTypeConfig, - SlobroksConfig slobroksConfig, MessagebusConfig messagebusConfig, - DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { - this.access = new VespaDocumentAccess(documentmanagerConfig, loadTypeConfig, slobroksConfig, messagebusConfig, - policiesConfig, distributionConfig); + MessagebusConfig messagebusConfig, DocumentProtocolPoliciesConfig policiesConfig, + DistributionConfig distributionConfig) { + this.access = new VespaDocumentAccess(documentmanagerConfig, loadTypeConfig, System.getProperty("config.id"), + messagebusConfig, policiesConfig, distributionConfig); } @Override diff --git a/container-core/src/main/java/com/yahoo/container/core/documentapi/VespaDocumentAccess.java b/container-core/src/main/java/com/yahoo/container/core/documentapi/VespaDocumentAccess.java index d01cd994fa5..a64300f1015 100644 --- a/container-core/src/main/java/com/yahoo/container/core/documentapi/VespaDocumentAccess.java +++ b/container-core/src/main/java/com/yahoo/container/core/documentapi/VespaDocumentAccess.java @@ -41,7 +41,7 @@ public class VespaDocumentAccess extends DocumentAccess { VespaDocumentAccess(DocumentmanagerConfig documentmanagerConfig, LoadTypeConfig loadTypeConfig, - SlobroksConfig slobroksConfig, + String slobroksConfigId, MessagebusConfig messagebusConfig, DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { @@ -49,7 +49,7 @@ public class VespaDocumentAccess extends DocumentAccess { this.parameters = new MessageBusParams(new LoadTypeSet(loadTypeConfig)) .setDocumentProtocolPoliciesConfig(policiesConfig, distributionConfig); this.parameters.setDocumentmanagerConfig(documentmanagerConfig); - this.parameters.getRPCNetworkParams().setSlobroksConfig(slobroksConfig); + this.parameters.getRPCNetworkParams().setSlobrokConfigId(slobroksConfigId); this.parameters.getMessageBusParams().setMessageBusConfig(messagebusConfig); } |