1 files changed, 3 insertions, 3 deletions
diff --git a/fnet/src/examples/frt/rpc/rpc_server.cpp b/fnet/src/examples/frt/rpc/rpc_server.cpp
index 03d618133c9..cc3972166ad 100644
--- a/fnet/src/examples/frt/rpc/rpc_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_server.cpp
@@ -91,12 +91,12 @@ RPCServer::Main(int argc, char **argv)
         return 1;
     }
 
-    _supervisor = new FRT_Supervisor();
+    fnet::frt::StandaloneFRT server;
+    _supervisor = &server.supervisor();
     InitRPC(_supervisor);
     _supervisor->Listen(argv[1]);
     FNET_SignalShutDown ssd(*_supervisor->GetTransport());
-    _supervisor->Main();
-    delete _supervisor;
+    server.wait_finished();
     return 0;
 }