Revert "only use "delete later" in notifyFailed callback"

This reverts commit f2db94927e4738897725ff1c6839450096346297.

1 files changed, 2 insertions, 0 deletions

diff --git a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp
index c3d231db77e..5836118d37d 100644
--- a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp
+++ b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp
@@ -84,6 +84,7 @@ void LocalRpcMonitorMap::add(const ServiceMapping &mapping) {
         if (removed.up) {
             _dispatcher.remove(removed.mapping());
         }
+        _delete.later(std::move(removed.srv));
     }
     auto [ iter, was_inserted ] =
         _map.try_emplace(mapping.name, globalService(mapping));
@@ -109,6 +110,7 @@ void LocalRpcMonitorMap::remove(const ServiceMapping &mapping) {
         if (removed.up) {
             _dispatcher.remove(removed.mapping());
         }
+        _delete.later(std::move(removed.srv));
     } else {
         LOG(debug, "tried to remove non-existing mapping %s->%s",
             mapping.name.c_str(), mapping.spec.c_str());