Remove conditional enabling of protocol feature in favor of version

Cannot selectively enable for DocumentProtocol since bucket space config
only applies per-cluster, while the protocol is application-global.

1 files changed, 2 insertions, 4 deletions

diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
index 9a3d3b71f38..b57be697a5e 100644
--- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp
+++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
@@ -444,8 +444,7 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig>
         // config here.
         _mbus = std::make_unique<mbus::RPCMessageBus>(
                 mbus::ProtocolSet()
-                        .add(std::make_shared<documentapi::DocumentProtocol>(*_component.getLoadTypes(), _component.getTypeRepo(), "",
-                                                                             _component.enableMultipleBucketSpaces()))
+                        .add(std::make_shared<documentapi::DocumentProtocol>(*_component.getLoadTypes(), _component.getTypeRepo()))
                         .add(std::make_shared<mbusprot::StorageProtocol>(_component.getTypeRepo(), *_component.getLoadTypes(),
                                                                          _component.enableMultipleBucketSpaces())),
                 params,
@@ -788,8 +787,7 @@ void CommunicationManager::updateMessagebusProtocol(
         const document::DocumentTypeRepo::SP &repo) {
     if (_mbus.get()) {
         framework::SecondTime now(_component.getClock().getTimeInSeconds());
-        mbus::IProtocol::SP newDocumentProtocol(new documentapi::DocumentProtocol(
-                *_component.getLoadTypes(), repo, "", _component.enableMultipleBucketSpaces()));
+        auto newDocumentProtocol = std::make_shared<documentapi::DocumentProtocol>(*_component.getLoadTypes(), repo);
         std::lock_guard<std::mutex> guard(_earlierGenerationsLock);
         _earlierGenerations.push_back(std::make_pair(now, _mbus->getMessageBus().putProtocol(newDocumentProtocol)));
         mbus::IProtocol::SP newStorageProtocol(new mbusprot::StorageProtocol(repo, *_component.getLoadTypes(), _component.enableMultipleBucketSpaces()));