Skip to content
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

retire: Fix False Positive issue #6021

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Conversation

kingthorin
Copy link
Member

@kingthorin kingthorin commented Dec 18, 2024

Overview

  • CHANGELOG > Added fix note.
  • Repo > Added handling for fall through of essentially "empty" object.
  • Tests > Added additional unit tests/assertions.

Related Issues

Reported via direct email and dev group.

Checklist

  • [na] Update help
  • Update changelog
  • Run ./gradlew spotlessApply for code formatting
  • Write tests
  • Check code coverage
  • Sign-off commits
  • Squash commits
  • Use a descriptive title

@psiinon

This comment was marked as resolved.

@kingthorin kingthorin force-pushed the retire-risk-bug branch 6 times, most recently from 737d6e5 to bdce229 Compare December 18, 2024 16:51
@thc202
Copy link
Member

thc202 commented Dec 19, 2024

We are going to have to release this to 2.15. Happy if the changes are done here in another commit but also if done in a follow up PR.

@kingthorin
Copy link
Member Author

Okay, if this is good I'll add the 2.15 commit.

@kingthorin kingthorin force-pushed the retire-risk-bug branch 3 times, most recently from 177e1cf to 11ce8f6 Compare December 19, 2024 10:44
@kingthorin
Copy link
Member Author

Done & done

@thc202
Copy link
Member

thc202 commented Dec 19, 2024

lgtm

- CHANGELOG > Added fix note.
- Repo > Added handling for fall through of essentially "empty" object.
- Tests > Added additional unit tests/assertions.

Signed-off-by: kingthorin <kingthorin@users.noreply.github.com>
@thc202 thc202 enabled auto-merge December 19, 2024 13:33
@thc202
Copy link
Member

thc202 commented Dec 19, 2024

Thank you!

@thc202 thc202 merged commit 4a7a8f3 into zaproxy:main Dec 19, 2024
9 of 10 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Dec 19, 2024
@kingthorin kingthorin deleted the retire-risk-bug branch December 19, 2024 13:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants