Revert "explicit cleanup of partners"

* cleanup now handled using guards.

This reverts commit 523cae59a21a3b7d6d21c4749ef0384595b85fcb.

2 files changed, 0 insertions, 9 deletions

diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp
index 539cdc4d67d..d7cd9556b9f 100644
--- a/slobrok/src/vespa/slobrok/server/sbenv.cpp
+++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp
@@ -122,17 +122,10 @@ SBEnv::SBEnv(const ConfigShim &shim)
     _rpcHooks.initRPC(getSupervisor());
 }
 
-void SBEnv::cleanup() {
-    auto pList = _exchanger.getPartnerList();
-    for (const auto & partner : pList) {
-        _exchanger.removePartner(partner);
-    }
-}
 
 SBEnv::~SBEnv()
 {
     getTransport()->WaitFinished();
-    cleanup();
 }
 
 FNET_Scheduler *
@@ -191,7 +184,6 @@ SBEnv::MainLoop()
         EV_STARTED("slobrok");
         getTransport()->Main();
         LOG(debug, "slobrok: main event loop done");
-        cleanup();
     } catch (vespalib::Exception &e) {
         LOG(error, "invalid config: %s", e.what());
         EV_STOPPING("slobrok", "invalid config");
diff --git a/slobrok/src/vespa/slobrok/server/sbenv.h b/slobrok/src/vespa/slobrok/server/sbenv.h
index 72efb9edb59..b744a2d1d92 100644
--- a/slobrok/src/vespa/slobrok/server/sbenv.h
+++ b/slobrok/src/vespa/slobrok/server/sbenv.h
@@ -60,7 +60,6 @@ private:
     UnionServiceMap                            _consensusMap;
     ServiceMapHistory                          _globalVisibleHistory;
 
-    void cleanup();
 public:
     explicit SBEnv(const ConfigShim &shim);
     ~SBEnv();