Pass enable multiple bucket spaces flag to storage protocol.

Use new serialization when multiple bucket spaces are enabled.

1 files changed, 4 insertions, 4 deletions

diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
index edc8ca6a3b6..6d1dc8d587b 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
@@ -98,8 +98,8 @@ StorageProtocol::encode(const vespalib::Version& version,
         } else if (version < version5_2) {
             return encodeMessage(_serializer5_1, routable, message, version5_1, version);
         } else {
-            if (!_activateBucketSpaceSerialization) {
-                return encodeMessage(_serializer5_2, routable, message, version5_2, version);
+            if (_activateBucketSpaceSerialization) {
+                return encodeMessage(_serializer6_0, routable, message, version6_0, version);
             } else {
                if (version < version6_0) {
                    return encodeMessage(_serializer5_2, routable, message, version5_2, version);
@@ -169,8 +169,8 @@ StorageProtocol::decode(const vespalib::Version & version,
         } else if (version < version5_2) {
             return decodeMessage(_serializer5_1, data, type, version5_1, version);
         } else {
-            if (!_activateBucketSpaceSerialization) {
-                return decodeMessage(_serializer5_2, data, type, version5_2, version);
+            if (_activateBucketSpaceSerialization) {
+                return decodeMessage(_serializer6_0, data, type, version6_0, version);
             } else {
                 if (version < version6_0) {
                     return decodeMessage(_serializer5_2, data, type, version5_2, version);