diff options
| author | Tor Brede Vekterli <vekterli@yahooinc.com> | 2021-11-15 17:09:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 17:09:37 +0100 |
| commit | c33b0e408130c8151bbcd7ba00a1157afa3844ee (patch) | |
| tree | 46f28be3acc21704506d2db53b0ae8d038d74e34 /storage/src/tests/distributor/top_level_distributor_test_util.cpp | |
| parent | db66334f65d6a884afc2c5b4ba44c1e6806d5673 (diff) | |
| parent | 31d7bb1db30076eb7a33085d3bf2dd12683bf557 (diff) | |
Merge pull request #20000 from vespa-engine/vekterli/support-unordered-merge-chaining
Add configurable support for unordered merge forwarding [run-systemtest]
Diffstat (limited to 'storage/src/tests/distributor/top_level_distributor_test_util.cpp')
| -rw-r--r-- | storage/src/tests/distributor/top_level_distributor_test_util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/src/tests/distributor/top_level_distributor_test_util.cpp b/storage/src/tests/distributor/top_level_distributor_test_util.cpp index 636a09d1f6e..2a61141865a 100644 --- a/storage/src/tests/distributor/top_level_distributor_test_util.cpp +++ b/storage/src/tests/distributor/top_level_distributor_test_util.cpp @@ -115,13 +115,13 @@ TopLevelDistributorTestUtil::handle_top_level_message(const std::shared_ptr<api: void TopLevelDistributorTestUtil::close() { - _component.reset(0); - if (_distributor.get()) { + _component.reset(); + if (_distributor) { _stripe_pool->stop_and_join(); // Must be tagged as stopped prior to onClose _distributor->onClose(); } _sender.clear(); - _node.reset(0); + _node.reset(); _config = getStandardConfig(false); } |