Wait on the transport directly.

5 files changed, 3 insertions, 10 deletions

diff --git a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
index 7e0caaba00d..872894b190d 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
@@ -65,7 +65,7 @@ MyApp::Main()
     rpc.Init(&supervisor);
     supervisor.Listen(_argv[1]);
     FNET_SignalShutDown ssd(*supervisor.GetTransport());
-    server.wait_finished();
+    server.supervisor().GetTransport()->WaitFinished();
     return 0;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_proxy.cpp b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
index fa152dcec10..1f1a3a80f2f 100644
--- a/fnet/src/examples/frt/rpc/rpc_proxy.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
@@ -235,7 +235,7 @@ App::Main()
     supervisor.SetMethodMismatchHook(FRT_METHOD(RPCProxy::HOOK_Mismatch), &proxy);
     supervisor.Listen(_argv[1]);
     FNET_SignalShutDown ssd(*supervisor.GetTransport());
-    server.wait_finished();
+    server.supervisor().GetTransport()->WaitFinished();
     return 0;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_server.cpp b/fnet/src/examples/frt/rpc/rpc_server.cpp
index cc3972166ad..aa521080538 100644
--- a/fnet/src/examples/frt/rpc/rpc_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_server.cpp
@@ -96,7 +96,7 @@ RPCServer::Main(int argc, char **argv)
     InitRPC(_supervisor);
     _supervisor->Listen(argv[1]);
     FNET_SignalShutDown ssd(*_supervisor->GetTransport());
-    server.wait_finished();
+    server.supervisor().GetTransport()->WaitFinished();
     return 0;
 }
 
diff --git a/fnet/src/vespa/fnet/frt/supervisor.cpp b/fnet/src/vespa/fnet/frt/supervisor.cpp
index d5c7e0847f7..f9cbfe2a662 100644
--- a/fnet/src/vespa/fnet/frt/supervisor.cpp
+++ b/fnet/src/vespa/fnet/frt/supervisor.cpp
@@ -429,9 +429,4 @@ StandaloneFRT::~StandaloneFRT()
     _transport->ShutDown(true);
 }
 
-void
-StandaloneFRT::wait_finished() const {
-    _transport->WaitFinished();
-}
-
 }
diff --git a/fnet/src/vespa/fnet/frt/supervisor.h b/fnet/src/vespa/fnet/frt/supervisor.h
index 1247cb08402..3abb522ba52 100644
--- a/fnet/src/vespa/fnet/frt/supervisor.h
+++ b/fnet/src/vespa/fnet/frt/supervisor.h
@@ -133,8 +133,6 @@ public:
     explicit StandaloneFRT(std::shared_ptr<vespalib::CryptoEngine> crypto);
     ~StandaloneFRT();
     FRT_Supervisor & supervisor() { return *_supervisor; }
-    // TODO Remove this method as it is a relic from the ancient non-threaded world.
-    void wait_finished() const;
 private:
     std::unique_ptr<FastOS_ThreadPool> _threadPool;
     std::unique_ptr<FNET_Transport> _transport;