Skip to content

Commit f94150b

Browse files
committed
Switch from List to array
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
1 parent 6014fad commit f94150b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

rcljava/src/main/java/org/ros2/rcljava/action/ActionServerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ private action_msgs.srv.CancelGoal_Response executeCancelRequest(
346346

347347
// Process user callback for each goal in cancel request
348348
for (action_msgs.msg.GoalInfo goalInfo : inputMessage.getGoalsCanceling()) {
349-
List<Byte> goalUuid = goalInfo.getGoalId().getUuid();
349+
List<Byte> goalUuid = goalInfo.getGoalId().getUuidAsList();
350350
// It's possible a goal may not be tracked by the user
351351
if (!this.goalHandles.containsKey(goalUuid)) {
352352
logger.warn("Ignoring cancel request for untracked goal handle with ID '" + goalUuid + "'");

rcljava/src/test/java/org/ros2/rcljava/action/ActionServerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ public final void testCancelGoal() throws Exception {
223223

224224
assertEquals(true, cancelResponseFuture.isDone());
225225
action_msgs.srv.CancelGoal_Response cancelResponse = cancelResponseFuture.get();
226-
List<action_msgs.msg.GoalInfo> goalsCanceling = cancelResponse.getGoalsCanceling();
227-
assertEquals(1, goalsCanceling.size());
226+
action_msgs.msg.GoalInfo[] goalsCanceling = cancelResponse.getGoalsCanceling();
227+
assertEquals(1, goalsCanceling.length);
228228

229229
// Assert cancel callback was triggered
230230
assertNotEquals(null, this.cancelCallback.goalHandle);

rcljava_common/src/main/java/org/ros2/rcljava/interfaces/GoalRequestDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919

2020
public interface GoalRequestDefinition<T extends ActionDefinition> extends MessageDefinition {
2121
MessageDefinition getGoal();
22-
byte[] getGoalUuid();
22+
List<Byte> getGoalUuid();
2323
}

0 commit comments

Comments
 (0)