return nil if :get-result called without sending a goal

c.f. yuki-asano/jsk_robot#1 (comment)
jsk-ros-pkg · Oct 29, 2023 · 09a70e6 · 09a70e6
1 parent 795e764
commit 09a70e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/roseus/euslisp/actionlib.l b/roseus/euslisp/actionlib.l
@@ -221,7 +221,12 @@
      (if (eq (send self :get-state) actionlib_msgs::GoalStatus::*preempted*)
          (ros::ros-warn "[~A] :wait-for-result finished with preempted status" name-space))
      (eq (send self :get-state) actionlib_msgs::GoalStatus::*succeeded*)))
-  (:get-result () (send (send comm-state :latest-result) :result))
+  (:get-result ()
+   (if (send comm-state :latest-result)
+       (send (send comm-state :latest-result) :result)
+       (progn
+         (ros::ros-error "[~A] :get-result called without sending goal, returns null result" name-space)
+         nil))) ;; return nil instead of (instance action-result-class :init)
   (:get-state ()
     (let (state)
       (setq state (send (send comm-state :latest-goal-status) :status))

diff --git a/roseus/test/test-actionlib.test b/roseus/test/test-actionlib.test
@@ -3,5 +3,7 @@
   <node name="fibonacci_client" pkg="roseus" type="roseus" args="$(find roseus)/test/fibonacci-client.l" />
   <test test-name="test_actionlib_client" pkg="roseus" type="roseus" args="$(find roseus)/test/test-actionlib.l"
         time-limit="600" retry="3"/>
+  <test test-name="test_actionlib_client_result_before_start" pkg="roseus" type="roseus" args="$(find roseus)/test/test-actionlib-get-result-before-start.l"
+        time-limit="60" retry="1"/>
 </launch>