[CP #1693 > support/v5.13] [core] remove-callbacks-before-stopping-tcp-protocol-layer

[eclipse-ecal-bot]

Cherry-pick failed

Cherry-picked PR #1693 to branch support/v5.13.
The cherry-pick has failed.

The following files have caused conflicts:

ecal/core/src/service/ecal_service_server_impl.cpp

Resolving

Please resolve conflicts manually. You can use this PR and branch to your convenience.

git fetch origin
git checkout -b local/cherry-pick/6886ee4/support/v5.13 origin/support/v5.13
git branch -u origin/cherry-pick/6886ee4/support/v5.13
git cherry-pick 9e8ecbbe2e0f30e05b2f492d4b2fb3f11bfb7e7e..6886ee4022554cb4b8608fb2ffd16e166f45545a

# Resolve conflicts and use
#     git cherry-pick --continue
# until all conflicts are resolved.

git push -f origin HEAD:cherry-pick/6886ee4/support/v5.13

After resolving all conflicts, rebase-merge this PR.