capicxx-someip-runtime 3.1.12.10

COVESA · Jan 25, 2018 · 6e82d40 · 6e82d40
1 parent f15eaac
commit 6e82d40
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,10 @@
 Changes
 =======
+
+v3.1.12.10
+- Ensure subsequent event delivery after uncatched exceptions in
+  registered event handlers by the user
+
 v3.1.12.9
 - support 'lock functors' in AttributeDispatcher(s)
 

diff --git a/include/CommonAPI/SomeIP/Event.hpp b/include/CommonAPI/SomeIP/Event.hpp
@@ -67,11 +67,10 @@ class Event: public Events_  {
         }
 
         virtual void onEventMessage(const Message &_message) {
-            notificationMutex_.lock();
+            std::lock_guard<std::mutex> itsLock(notificationMutex_);
             if (auto ptr = proxy_.lock()) {
                 event_->handleEventMessage(_message, typename make_sequence<sizeof...(Arguments_)>::type());
             }
-            notificationMutex_.unlock();
         }
 
         virtual void onError(const uint16_t _errorCode, const uint32_t _tag) {

diff --git a/src/CommonAPI/SomeIP/Factory.cpp b/src/CommonAPI/SomeIP/Factory.cpp
@@ -70,7 +70,7 @@ void
 Factory::registerProxyCreateMethod(
     const std::string &_interface,
     ProxyCreateFunction _function) {
-    COMMONAPI_INFO("Registering function for creating \"", _interface,
+    COMMONAPI_VERBOSE("Registering function for creating \"", _interface,
             "\" proxy.");
     proxyCreateFunctions_[_interface] = _function;
 }
@@ -90,7 +90,7 @@ Factory::createProxy(
     const std::string &_interface, const std::string &_instance,
     const ConnectionId_t &_connectionId) {
 
-    COMMONAPI_INFO("Creating proxy for \"", _domain, ":", _interface, ":",
+    COMMONAPI_VERBOSE("Creating proxy for \"", _domain, ":", _interface, ":",
             _instance, "\"");
 
     auto proxyCreateFunctionsIterator = proxyCreateFunctions_.find(_interface);
@@ -121,7 +121,7 @@ Factory::createProxy(
     const std::string &_interface, const std::string &_instance,
     std::shared_ptr<MainLoopContext> _context) {
 
-    COMMONAPI_INFO("Creating proxy for \"", _domain, ":", _interface, ":",
+    COMMONAPI_VERBOSE("Creating proxy for \"", _domain, ":", _interface, ":",
             _instance, "\"");
 
     auto proxyCreateFunctionsIterator = proxyCreateFunctions_.find(_interface);