associated clocks should be protected by mutex. (#2255)

Signed-off-by: Tomoya Fujita <[email protected]>
(cherry picked from commit 5d6e5fa)

# Conflicts:
#	rclcpp/src/rclcpp/time_source.cpp

rclcpp/src/rclcpp/time_source.cpp

@@ -53,6 +53,7 @@ class ClocksState final
     ros_time_active_ = true;
 
     // Update all attached clocks to zero or last recorded time
+<<<<<<< HEAD
     std::lock_guard<std::mutex> guard(clock_list_lock_);
     auto time_msg = std::make_shared<builtin_interfaces::msg::Time>();
     if (last_msg_set_) {
@@ -61,6 +62,9 @@ class ClocksState final
     for (auto it = associated_clocks_.begin(); it != associated_clocks_.end(); ++it) {
       set_clock(time_msg, true, *it);
     }
+=======
+    set_all_clocks(last_time_msg_, true);
+>>>>>>> 5d6e5fa7 (associated clocks should be protected by mutex. (#2255))
   }
 
   // An internal method to use in the clock callback that iterates and disables all clocks
@@ -75,11 +79,8 @@ class ClocksState final
     ros_time_active_ = false;
 
     // Update all attached clocks
-    std::lock_guard<std::mutex> guard(clock_list_lock_);
-    for (auto it = associated_clocks_.begin(); it != associated_clocks_.end(); ++it) {
-      auto msg = std::make_shared<builtin_interfaces::msg::Time>();
-      set_clock(msg, false, *it);
-    }
+    auto msg = std::make_shared<builtin_interfaces::msg::Time>();
+    set_all_clocks(msg, false);
   }
 
   // Check if ROS time is active