diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-21 12:03:44 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-21 12:03:44 +0200 |
| commit | d21534e78b97e6e77fb9f79bd71be230105d7daa (patch) | |
| tree | b9dd483bbc958085c97d084641cfc969c960cdac /messagebus | |
| parent | 195349ccdb1e4d30250d635ec03d03a2597f8dd1 (diff) | |
Version 6.149 is using new compressed protocol.
Diffstat (limited to 'messagebus')
| -rw-r--r-- | messagebus/src/tests/sendadapter/sendadapter.cpp | 10 | ||||
| -rw-r--r-- | messagebus/src/vespa/messagebus/network/rpcnetwork.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/messagebus/src/tests/sendadapter/sendadapter.cpp b/messagebus/src/tests/sendadapter/sendadapter.cpp index 813f9186c4c..6860453cf54 100644 --- a/messagebus/src/tests/sendadapter/sendadapter.cpp +++ b/messagebus/src/tests/sendadapter/sendadapter.cpp @@ -210,18 +210,18 @@ TEST("test that all known versions are present") { EXPECT_FALSE(data._srcServer.net.getSendAdapter(vespalib::Version(4, 999)) != nullptr); EXPECT_TRUE(data._srcServer.net.getSendAdapter(vespalib::Version(5, 0)) != nullptr); EXPECT_TRUE(dynamic_cast<mbus::RPCSendV1 *>(data._srcServer.net.getSendAdapter(vespalib::Version(5, 0))) != nullptr); - EXPECT_TRUE(data._srcServer.net.getSendAdapter(vespalib::Version(6, 147)) != nullptr); - EXPECT_TRUE(dynamic_cast<mbus::RPCSendV1 *>(data._srcServer.net.getSendAdapter(vespalib::Version(6, 147))) != nullptr); EXPECT_TRUE(data._srcServer.net.getSendAdapter(vespalib::Version(6, 148)) != nullptr); - EXPECT_TRUE(dynamic_cast<mbus::RPCSendV2 *>(data._srcServer.net.getSendAdapter(vespalib::Version(6, 148))) != nullptr); + EXPECT_TRUE(dynamic_cast<mbus::RPCSendV1 *>(data._srcServer.net.getSendAdapter(vespalib::Version(6, 148))) != nullptr); + EXPECT_TRUE(data._srcServer.net.getSendAdapter(vespalib::Version(6, 149)) != nullptr); + EXPECT_TRUE(dynamic_cast<mbus::RPCSendV2 *>(data._srcServer.net.getSendAdapter(vespalib::Version(6, 149))) != nullptr); EXPECT_TRUE(data._srcServer.net.getSendAdapter(vespalib::Version(9, 999)) != nullptr); EXPECT_TRUE(dynamic_cast<mbus::RPCSendV2 *>(data._srcServer.net.getSendAdapter(vespalib::Version(9, 999))) != nullptr); } -TEST("test that ee can send between multiple versions") { +TEST("test that we can send between multiple versions") { TestData data; ASSERT_TRUE(data.start()); - TEST_DO(testSendAdapters(data, {vespalib::Version(5, 0), vespalib::Version(6, 147), vespalib::Version(6, 148)})); + TEST_DO(testSendAdapters(data, {vespalib::Version(5, 0), vespalib::Version(6, 148), vespalib::Version(6, 149), vespalib::Version(9, 999)})); } TEST_MAIN() { TEST_RUN_ALL(); } diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp index ad34ab2caff..e5c292fedd9 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp @@ -181,7 +181,7 @@ RPCNetwork::attach(INetworkOwner &owner) _sendV1->attach(*this); _sendV2->attach(*this); _sendAdapters[vespalib::Version(5)] = _sendV1.get(); - _sendAdapters[vespalib::Version(6, 148)] = _sendV2.get(); + _sendAdapters[vespalib::Version(6, 149)] = _sendV2.get(); FRT_ReflectionBuilder builder(_orb.get()); builder.DefineMethod("mbus.getVersion", "", "s", true, FRT_METHOD(RPCNetwork::invoke), this); |