Move recalculate timer call so timer always becomes un-ready

ros2 · Nov 29, 2018 · 6963a98 · 6963a98
1 parent 058a16e
commit 6963a98
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/rcl_action/src/rcl_action/action_server.c b/rcl_action/src/rcl_action/action_server.c
@@ -660,14 +660,13 @@ rcl_action_expire_goals(
         action_server->impl->num_goal_handles = num_goal_handles;
       }
     }
-    ret_final = _recalculate_expire_timer(
-      &action_server->impl->expire_timer,
-      action_server->impl->options.result_timeout.nanoseconds,
-      action_server->impl->goal_handles,
-      action_server->impl->num_goal_handles,
-      &action_server->impl->clock);
   }
-
+  ret_final = _recalculate_expire_timer(
+    &action_server->impl->expire_timer,
+    action_server->impl->options.result_timeout.nanoseconds,
+    action_server->impl->goal_handles,
+    action_server->impl->num_goal_handles,
+    &action_server->impl->clock);
 
   // If argument is not null, then set it
   if (NULL != num_expired) {