Code in wait function continues to possibly return RMW_RET_OK despite DDS return error

[dejanpan]

Bug report

Required Info:

• Operating System:

  • Ubuntu 16.04

• Installation type:

(

rmw_connext/rmw_connext_shared_cpp/include/rmw_connext_shared_cpp/wait.hpp

Line 254 in 661993a

RMW_SET_ERROR_MSG("Failed to get detach condition from waitset");

)

(

rmw_connext/rmw_connext_shared_cpp/include/rmw_connext_shared_cpp/wait.hpp

Line 288 in 661993a

RMW_SET_ERROR_MSG("Failed to get detach condition from waitset");

)

(

rmw_connext/rmw_connext_shared_cpp/include/rmw_connext_shared_cpp/wait.hpp

Line 321 in 661993a

RMW_SET_ERROR_MSG("Failed to get detach condition from waitset");

)

(

rmw_connext/rmw_connext_shared_cpp/include/rmw_connext_shared_cpp/wait.hpp

Line 353 in 661993a

RMW_SET_ERROR_MSG("Failed to get detach condition from waitset");

)

• Version or commit hash:
  • see above
• DDS implementation:
  • RTI Connext
• Client library (if applicable):
  • NA

Steps to reproduce issue

Quoting @dirk-thomas

After setting the error message the function should return `RMW_RET_ERROR`. The quick fix would be to just add the return statement in the cases it is missing.

The "correct" fix would be to update the structure of the code to store the return value in a value but still perform the other cleanup and only at the very end `return`.

I will provide PR for the quick fix and started an issue for the correct fix.

[dejanpan]

@dirk-thomas here we are also missing a return; right?

[dirk-thomas]

here we are also missing a return; right?

@dejanpan Yes, indeed. Since I saw and merged the PR first can you please create a follow up PR for that line. Thanks.