-
Notifications
You must be signed in to change notification settings - Fork 775
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[20599] Protect asio exception hotfix (backport #4527) #4533
Conversation
Cherry-pick of 08193d5 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
7f03c2d
to
f2e0bc1
Compare
05c889a
to
8b9a329
Compare
807d8b9
to
b1e2cf0
Compare
@cferreiragonz could you take a look at the conflicts here ? We are finally unblocked for merging this PR ! |
* Refs #20599: Handle error code before function call Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Apply suggestion Co-authored-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 08193d5) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp
* Protect asio exception hotfix (#4527) * Refs #20599: Handle error code before function call Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Apply suggestion Co-authored-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 08193d5) * Backport of #4319 && Partial backport of #4300 Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> --------- Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
f2e0bc1
to
b268841
Compare
@richiprosima please test this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, failed tests unrelated with the TCP transport changes in this PR. RTM
This is an automatic backport of pull request #4527 done by Mergify.
Cherry-pick of 08193d5 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com