Updated codes based on reveiw comments

Signed-off-by: Barry Xu <barry.xu@sony.com>
ros2 · May 30, 2021 · 5c2a7f4 · 5c2a7f4
1 parent f8fcdee
commit 5c2a7f4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/rmw_fastrtps_shared_cpp/CMakeLists.txt b/rmw_fastrtps_shared_cpp/CMakeLists.txt
@@ -86,9 +86,9 @@ add_library(rmw_fastrtps_shared_cpp
   src/rmw_wait.cpp
   src/rmw_wait_set.cpp
   src/subscription.cpp
+  src/time_utils.cpp
   src/TypeSupport_impl.cpp
   src/utils.cpp
-  src/time_utils.cpp
 )
 target_include_directories(rmw_fastrtps_shared_cpp
   PUBLIC

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_publisher.cpp b/rmw_fastrtps_shared_cpp/src/rmw_publisher.cpp
@@ -135,10 +135,6 @@ __rmw_publisher_wait_for_all_acked(
     return RMW_RET_INCORRECT_RMW_IMPLEMENTATION);
 
   auto info = static_cast<CustomPublisherInfo *>(publisher->data);
-  if (nullptr == info) {
-    RMW_SET_ERROR_MSG("publisher internal data is invalid");
-    return RMW_RET_ERROR;
-  }
 
   eprosima::fastrtps::Duration_t timeout = rmw_time_to_fastrtps(wait_timeout);