Handle unexpected exception during method call

Change-Id: Ie86a2df3e5f1570933934d09a867e1925a1cb6d0
Signed-off-by: Jaemin Ryu <jm77.ryu@samsung.com>

diff --git a/src/rmi/service.cpp b/src/rmi/service.cpp
index 22d17a3a09dfa672a9b3a3cfc9e84cfb261a8d82..ab86f196ab7acae2d4c8c78ac6965cb1c5f90d20 100644 (file)
--- a/src/rmi/service.cpp
+++ b/src/rmi/service.cpp
@@ -212,7 +212,13 @@ void Service::onMessageProcess(const std::shared_ptr<Connection>& connection)
 
                        connection->send(methodContext->dispatcher(request));
                } catch (runtime::Exception& e) {
-                       connection->send(request.createErrorMessage(e.className(), e.what()));
+                       try {
+                               // Forward the exception to the peer
+                               connection->send(request.createErrorMessage(e.className(), e.what()));
+                       } catch (std::exception& ex) {
+                               // The connection is abnormally closed by the peer.
+                               ERROR(KSINK, ex.what());
+                       }
                } catch (std::exception& e) {
                        try {
                                // Forward the exception to the peer