Make rmw_service_server_is_available return RMW_RET_INVALID_ARGUMENT (#763)

christophebedard-apexai · web-flow · commit 9383b4e0a628 · 2024-06-13T15:35:13.000-04:00
Signed-off-by: Christophe Bedard &lt;christophe.bedard@apex.ai&gt;
diff --git a/rmw_fastrtps_shared_cpp/src/rmw_service_server_is_available.cpp b/rmw_fastrtps_shared_cpp/src/rmw_service_server_is_available.cpp
@@ -43,7 +43,7 @@ __rmw_service_server_is_available(
 {
   if (!node) {
     RMW_SET_ERROR_MSG("node handle is null");
-    return RMW_RET_ERROR;
+    return RMW_RET_INVALID_ARGUMENT;
   }
 
   RMW_CHECK_TYPE_IDENTIFIERS_MATCH(
@@ -53,7 +53,7 @@ __rmw_service_server_is_available(
 
   if (!client) {
     RMW_SET_ERROR_MSG("client handle is null");
-    return RMW_RET_ERROR;
+    return RMW_RET_INVALID_ARGUMENT;
   }
 
   RMW_CHECK_TYPE_IDENTIFIERS_MATCH(
@@ -63,7 +63,7 @@ __rmw_service_server_is_available(
 
   if (!is_available) {
     RMW_SET_ERROR_MSG("is_available is null");
-    return RMW_RET_ERROR;
+    return RMW_RET_INVALID_ARGUMENT;
   }
 
   auto client_info = static_cast<CustomClientInfo *>(client->data);

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ __rmw_service_server_is_available(`
`43`	`43`	`{`
`44`	`44`	`if (!node) {`
`45`	`45`	`RMW_SET_ERROR_MSG("node handle is null");`
`46`		`- return RMW_RET_ERROR;`
	`46`	`+ return RMW_RET_INVALID_ARGUMENT;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`RMW_CHECK_TYPE_IDENTIFIERS_MATCH(`
`@@ -53,7 +53,7 @@ __rmw_service_server_is_available(`
`53`	`53`
`54`	`54`	`if (!client) {`
`55`	`55`	`RMW_SET_ERROR_MSG("client handle is null");`
`56`		`- return RMW_RET_ERROR;`
	`56`	`+ return RMW_RET_INVALID_ARGUMENT;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`RMW_CHECK_TYPE_IDENTIFIERS_MATCH(`
`@@ -63,7 +63,7 @@ __rmw_service_server_is_available(`
`63`	`63`
`64`	`64`	`if (!is_available) {`
`65`	`65`	`RMW_SET_ERROR_MSG("is_available is null");`
`66`		`- return RMW_RET_ERROR;`
	`66`	`+ return RMW_RET_INVALID_ARGUMENT;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`auto client_info = static_cast<CustomClientInfo *>(client->data);`