diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-16 13:28:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 13:28:31 +0200 |
| commit | 8927587becdd9a1898895fd76810b04f9c0161f0 (patch) | |
| tree | 11b4f863ba31b7273ecb4794a6928d7be33ac994 /messagebus | |
| parent | 7070711f0364109cb7e815ca8b9cba72388c30ad (diff) | |
| parent | 8a564afe5f4f11216c9fa239f35ff71cfceb321f (diff) | |
Merge pull request #9438 from vespa-engine/havardpe/avoid-unit-test-hang
band-aid to avoid blocking forever in transport shutdown
Diffstat (limited to 'messagebus')
| -rw-r--r-- | messagebus/src/vespa/messagebus/network/rpcnetwork.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp index be25a73ece2..04d1f634f09 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp @@ -217,10 +217,10 @@ RPCNetwork::getSendAdapter(const vespalib::Version &version) bool RPCNetwork::start() { - if (!_orb->Listen(_requestedPort)) { + if (!_transport->Start(_threadPool.get())) { return false; } - if (!_transport->Start(_threadPool.get())) { + if (!_orb->Listen(_requestedPort)) { return false; } return true; |