Skip to content

Prevents the Future result from being set twice. (backport #1599)#1605

Open
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-1599
Open

Prevents the Future result from being set twice. (backport #1599)#1605
mergify[bot] wants to merge 1 commit intohumblefrom
mergify/bp/humble/pr-1599

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 4, 2026

Description

Fixes #1598

Is this user-facing behavior change?

Yes, but this fixes the behavior that has been changed by #1469

Did you use Generative AI?

Yes, Copilot Claude Sonnet 4.5

Additional Information


This is an automatic backport of pull request #1599 done by [Mergify](https://mergify.com).

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 4, 2026

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

@JWhitleyWork
Copy link
Copy Markdown

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

@fujitatomoya
Copy link
Copy Markdown
Collaborator

@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.

@fujitatomoya
Copy link
Copy Markdown
Collaborator

@Mergifyio rebase humble

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Nadav Elkabets <elnadav12@gmail.com>
(cherry picked from commit a348801)

# Conflicts:
#	rclpy/rclpy/action/server.py
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 26, 2026

rebase humble

✅ Branch has been successfully rebased

@fujitatomoya fujitatomoya force-pushed the mergify/bp/humble/pr-1599 branch from 6f0a360 to 17d43fc Compare February 26, 2026 23:30
@fujitatomoya
Copy link
Copy Markdown
Collaborator

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

@JWhitleyWork
Copy link
Copy Markdown

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

@JWhitleyWork
Copy link
Copy Markdown

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants