Add resources_lock_ lock_guards to avoid race condition when loading …

…robot_description through topic (#1451)

(cherry picked from commit 25f2c97)

# Conflicts:
#	hardware_interface/src/resource_manager.cpp

hardware_interface/src/resource_manager.cpp

@@ -684,8 +684,13 @@ void ResourceManager::load_urdf(
   const std::string sensor_type = "sensor";
   const std::string actuator_type = "actuator";
 
+<<<<<<< HEAD
   const auto hardware_info = hardware_interface::parse_control_resources_from_urdf(urdf);
   if (load_and_initialize_components)
+=======
+  std::lock_guard<std::recursive_mutex> resource_guard(resources_lock_);
+  for (const auto & individual_hardware_info : hardware_info)
+>>>>>>> 25f2c97 (Add resources_lock_ lock_guards to avoid race condition when loading robot_description through topic (#1451))
   {
     for (const auto & individual_hardware_info : hardware_info)
     {
@@ -1209,6 +1214,7 @@ return_type ResourceManager::set_component_state(
     return false;
   };
 
+  std::lock_guard<std::recursive_mutex> guard(resources_lock_);
   bool found = find_set_component_state(
     std::bind(&ResourceStorage::set_component_state<Actuator>, resource_storage_.get(), _1, _2),
     resource_storage_->actuators_);