Skip to content

Commit 16911a8

Browse files
committed
Fix logic in the collection as well
Signed-off-by: Michael Carroll <[email protected]>
1 parent 5596ab5 commit 16911a8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

rclcpp/src/rclcpp/executors/executor_entities_collection.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ ready_executables(
153153
continue;
154154
}
155155
auto group_info = group_cache(entity_iter->second.callback_group);
156-
if (group_info && !group_info->can_be_taken_from().load()) {
156+
if (!group_info || !group_info->can_be_taken_from().load()) {
157157
continue;
158158
}
159159
if (!entity->call()) {
@@ -176,7 +176,7 @@ ready_executables(
176176
continue;
177177
}
178178
auto group_info = group_cache(entity_iter->second.callback_group);
179-
if (group_info && !group_info->can_be_taken_from().load()) {
179+
if (!group_info || !group_info->can_be_taken_from().load()) {
180180
continue;
181181
}
182182
rclcpp::AnyExecutable exec;
@@ -196,7 +196,7 @@ ready_executables(
196196
continue;
197197
}
198198
auto group_info = group_cache(entity_iter->second.callback_group);
199-
if (group_info && !group_info->can_be_taken_from().load()) {
199+
if (!group_info || !group_info->can_be_taken_from().load()) {
200200
continue;
201201
}
202202
rclcpp::AnyExecutable exec;
@@ -216,7 +216,7 @@ ready_executables(
216216
continue;
217217
}
218218
auto group_info = group_cache(entity_iter->second.callback_group);
219-
if (group_info && !group_info->can_be_taken_from().load()) {
219+
if (!group_info || !group_info->can_be_taken_from().load()) {
220220
continue;
221221
}
222222
rclcpp::AnyExecutable exec;
@@ -236,7 +236,7 @@ ready_executables(
236236
continue;
237237
}
238238
auto group_info = group_cache(entry.callback_group);
239-
if (group_info && !group_info->can_be_taken_from().load()) {
239+
if (!group_info || !group_info->can_be_taken_from().load()) {
240240
continue;
241241
}
242242
rclcpp::AnyExecutable exec;

0 commit comments

Comments
 (0)