Minimized use of policy_manager_lock_.

smartdevicelink · Nov 9, 2018 · 741b392 · 741b392
1 parent 8dd6d43
commit 741b392
Show file tree

Hide file tree

Showing 2 changed files with 110 additions and 126 deletions.
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -744,9 +744,12 @@ class PolicyHandler : public PolicyHandlerInterface,
    * @return result PolicyManager function
    */
   template <typename Func, typename... Args>
-  auto CallPolicyManagerFunction(Func func, Args... args) const
+  auto CallPolicyManagerFunction(Func func, Args&&... args) const
       -> decltype((std::declval<PolicyManager>().*
-                   std::declval<Func>())(std::declval<Args>()...));
+                   std::declval<Func>())(std::declval<Args>()...)) {
+    sync_primitives::AutoLock lock(policy_manager_lock_);
+    return ((*policy_manager_).*func)(args...);
+  }
 
   /**
    * @brief Contains device handles, which were sent for user consent to HMI