From b9abc7e2057d44b61a78f37ba557936f510650bb Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Wed, 27 May 2020 10:21:44 -0700 Subject: [PATCH 1/2] transition start and goal states can be null Signed-off-by: Karsten Knese --- rcl_lifecycle/src/rcl_lifecycle.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/rcl_lifecycle/src/rcl_lifecycle.c b/rcl_lifecycle/src/rcl_lifecycle.c index ce6c07628..80a8ff0f6 100644 --- a/rcl_lifecycle/src/rcl_lifecycle.c +++ b/rcl_lifecycle/src/rcl_lifecycle.c @@ -132,16 +132,6 @@ rcl_lifecycle_transition_init( return RCL_RET_ERROR; } - if (!start) { - RCL_SET_ERROR_MSG("start state pointer is null\n"); - return RCL_RET_ERROR; - } - - if (!goal) { - RCL_SET_ERROR_MSG("goal state pointer is null\n"); - return RCL_RET_ERROR; - } - transition->start = start; transition->goal = goal; From 93dd1adfe019caaec7416f75eb40d09c21d0f6ef Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Wed, 27 May 2020 11:00:46 -0700 Subject: [PATCH 2/2] correct tests Signed-off-by: Karsten Knese --- rcl_lifecycle/test/test_rcl_lifecycle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rcl_lifecycle/test/test_rcl_lifecycle.cpp b/rcl_lifecycle/test/test_rcl_lifecycle.cpp index e429cd881..35a53f76e 100644 --- a/rcl_lifecycle/test/test_rcl_lifecycle.cpp +++ b/rcl_lifecycle/test/test_rcl_lifecycle.cpp @@ -133,12 +133,12 @@ TEST(TestRclLifecycle, lifecycle_transition) { ret = rcl_lifecycle_transition_init( &transition, expected_id, &expected_label[0], nullptr, nullptr, &allocator); - EXPECT_EQ(ret, RCL_RET_ERROR); + EXPECT_EQ(ret, RCL_RET_OK); rcutils_reset_error(); ret = rcl_lifecycle_transition_init( &transition, expected_id, &expected_label[0], start, nullptr, &allocator); - EXPECT_EQ(ret, RCL_RET_ERROR); + EXPECT_EQ(ret, RCL_RET_OK); rcutils_reset_error(); rcl_allocator_t bad_allocator = rcl_get_default_allocator();