Simplify the supervisor responsibility

1 files changed, 5 insertions, 6 deletions

diff --git a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
index 89d8cd881a8..b45d7986842 100644
--- a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
+++ b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
@@ -38,8 +38,7 @@ public:
 
     void rpc_inc(FRT_RPCRequest *req)
     {
-        req->GetReturn()->AddInt32(req->GetParams()->GetValue(0)._intval32
-                                   + 1);
+        req->GetReturn()->AddInt32(req->GetParams()->GetValue(0)._intval32 + 1);
     }
 
     void rpc_blob(FRT_RPCRequest *req)
@@ -79,10 +78,10 @@ App::Main()
         printf("usage: %s <listenspec>\n", _argv[0]);
         return 1;
     }
-    FRT_Supervisor orb;
-    Server server(&orb);
-    orb.Listen(_argv[1]);
-    orb.Main();
+    fnet::frt::StandaloneFRT frtServer;
+    Server server(&frtServer.supervisor());
+    frtServer.supervisor().Listen(_argv[1]);
+    frtServer.wait_finished();
     return 0;
 }