fix bug in next_waitable logic

wjwwood · wjwwood · commit 836946e23f2f · 2024-03-26T04:03:53.000-07:00
Signed-off-by: William Woodall &lt;william@osrfoundation.org&gt;
diff --git a/rclcpp/include/rclcpp/wait_result.hpp b/rclcpp/include/rclcpp/wait_result.hpp
@@ -276,11 +276,11 @@ class WaitResult final
       auto & wait_set = this->get_wait_set();
       auto rcl_wait_set = wait_set.get_rcl_wait_set();
       while (next_waitable_index_ < wait_set.size_of_waitables()) {
-        auto cur_waitable = wait_set.waitables(next_waitable_index_);
+        auto cur_waitable = wait_set.waitables(next_waitable_index_++);
         if (cur_waitable != nullptr && cur_waitable->is_ready(&rcl_wait_set)) {
           waitable = cur_waitable;
+          break;
         }
-        next_waitable_index_++;
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -276,11 +276,11 @@ class WaitResult final`
`276`	`276`	`auto & wait_set = this->get_wait_set();`
`277`	`277`	`auto rcl_wait_set = wait_set.get_rcl_wait_set();`
`278`	`278`	`while (next_waitable_index_ < wait_set.size_of_waitables()) {`
`279`		`- auto cur_waitable = wait_set.waitables(next_waitable_index_);`
	`279`	`+ auto cur_waitable = wait_set.waitables(next_waitable_index_++);`
`280`	`280`	`if (cur_waitable != nullptr && cur_waitable->is_ready(&rcl_wait_set)) {`
`281`	`281`	`waitable = cur_waitable;`
	`282`	`+ break;`
`282`	`283`	`}`
`283`		`- next_waitable_index_++;`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`