DataStorm connection manager fixes

zeroc-ice · Dec 17, 2024 · fb89e23 · fb89e23
1 parent b6d18ff
commit fb89e23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/cpp/src/DataStorm/ConnectionManager.cpp b/cpp/src/DataStorm/ConnectionManager.cpp
@@ -46,7 +46,7 @@ ConnectionManager::remove(const shared_ptr<void>& object, const Ice::ConnectionP
 }
 
 void
-ConnectionManager::remove(const Ice::ConnectionPtr& connection)
+ConnectionManager::remove(const Ice::ConnectionPtr& connection) noexcept
 {
     map<shared_ptr<void>, Callback> objects;
     {
@@ -60,27 +60,20 @@ ConnectionManager::remove(const Ice::ConnectionPtr& connection)
         connection->setCloseCallback(nullptr);
         _connections.erase(p);
     }
+
     exception_ptr ex;
     try
     {
-        [[maybe_unused]] auto _ = connection->getInfo();
+        connection->throwException();
     }
     catch (const std::exception&)
     {
         ex = current_exception();
     }
-    for (const auto& object : objects)
+
+    for (const auto& [_, callback] : objects)
     {
-        try
-        {
-            object.second(connection, ex);
-        }
-        catch (const std::exception& e)
-        {
-            cerr << e.what() << endl;
-            assert(false);
-            throw;
-        }
+        callback(connection, ex);
     }
     _executor->flush();
 }

diff --git a/cpp/src/DataStorm/ConnectionManager.h b/cpp/src/DataStorm/ConnectionManager.h
@@ -23,7 +23,7 @@ namespace DataStormI
             std::function<void(const Ice::ConnectionPtr&, std::exception_ptr)>);
 
         void remove(const std::shared_ptr<void>&, const Ice::ConnectionPtr&);
-        void remove(const Ice::ConnectionPtr&);
+        void remove(const Ice::ConnectionPtr&) noexcept;
 
         void destroy();