Cherry-pick of a348801 has failed:

On branch mergify/bp/humble/pr-1599
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit a348801.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclpy/rclpy/action/server.py

no changes added to commit (use "git add" and/or "git commit -a")

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

This backport didn't apply because #1582 needs to be merged first. @fujitatomoya Can you apply this change to that PR?

@JWhitleyWork thanks for pointing that out 👍

let's go step by step to keep the git history. i just started CI on #1582, and let's merge it 1st. and then we can get back to this PR.

@Mergifyio rebase humble

rebase humble

✅ Branch has been successfully rebased

@JWhitleyWork the base code is different from upstream, we should close this?

I will test to see if #1598 exists on the humble branch to see if this fix is still necessary.

This class doesn't even appear to have the functions necessary to support this fix so I think this can be closed.