Review fixes

zeroc-ice · May 28, 2024 · a4b1869 · a4b1869
1 parent 80b1236
commit a4b1869
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,4 +52,4 @@ jobs:
         timeout-minutes: 30
         with:
           working_directory: ice/cpp
-          msbuild_project: C++11 demos.sln
+          msbuild_project: C++ demos.sln
diff --git a/cpp/C++11 Qt demos.sln → cpp/C++ Qt demos.sln b/cpp/C++11 Qt demos.sln → cpp/C++ Qt demos.sln
diff --git a/cpp/C++11 demos.sln → cpp/C++ demos.sln b/cpp/C++11 demos.sln → cpp/C++ demos.sln
diff --git a/cpp/Chat/client/Client.cpp b/cpp/Chat/client/Client.cpp
@@ -84,8 +84,7 @@ createSession(Glacier2::RouterPrx router)
             optional<Chat::ChatSessionPrx> session{router->createSession(id, pw)};
             if (!session)
             {
-                cerr << "Glaicer2::createSession return null. Is the SessionManager configured?" << endl;
-                exit(1);
+                throw runtime_error("Glaicer2::createSession return null. Is the SessionManager configured?");
             }
             router->ice_getCachedConnection()->setCloseCallback(
                 [](Ice::ConnectionPtr)
@@ -116,8 +115,7 @@ run(shared_ptr<Ice::Communicator> communicator)
     optional<Glacier2::RouterPrx> router{communicator->getDefaultRouter()};
     if (!router)
     {
-        cerr << "No router configured" << endl;
-        exit(1);
+        throw runtime_error("Glaicer2::createSession return null. Is the SessionManager configured?");
     }
 
     // Create a session with the Glacier2 router

diff --git a/cpp/Glacier2/callback/Client.cpp b/cpp/Glacier2/callback/Client.cpp
@@ -64,10 +64,9 @@ run(const shared_ptr<Ice::Communicator>& communicator)
     optional<Ice::RouterPrx> defaultRouter = communicator->getDefaultRouter();
     if (!defaultRouter)
     {
-        cerr << "no router configured" << endl;
-        exit(1);
+        throw runtime_error("Glaicer2::createSession return null. Is the SessionManager configured?");
     }
-    const Glacier2::RouterPrx router = Glacier2::RouterPrx(*communicator->getDefaultRouter());
+    const Glacier2::RouterPrx router = Glacier2::RouterPrx(*defaultRouter);
 
     optional<Glacier2::SessionPrx> session;
     //

diff --git a/cpp/Glacier2/simpleChat/Client.cpp b/cpp/Glacier2/simpleChat/Client.cpp
@@ -72,10 +72,9 @@ run(const shared_ptr<Ice::Communicator>& communicator)
     optional<Ice::RouterPrx> defaultRouter = communicator->getDefaultRouter();
     if (!defaultRouter)
     {
-        cerr << "no router configured" << endl;
-        exit(1);
+        throw runtime_error("Glaicer2::createSession return null. Is the SessionManager configured?");
     }
-    const Glacier2::RouterPrx router = Glacier2::RouterPrx(*communicator->getDefaultRouter());
+    const Glacier2::RouterPrx router = Glacier2::RouterPrx(*defaultRouter);
     optional<ChatSessionPrx> session;
     while (!session)
     {