[ZEPPELIN-6404] Fix empty response body handling in merge_pr.py#5199
Merged
jongyoul merged 1 commit intoapache:masterfrom Mar 30, 2026
Merged
Conversation
JIRA transition API returns empty response body on success, which caused a JSONDecodeError. Return empty dict when body is empty. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Member
Author
|
It's a small fix for empty body of JIRA API. |
There was a problem hiding this comment.
Pull request overview
Fixes dev/merge_pr.py’s HTTP helper to safely handle JIRA transition responses that return 204 No Content (empty body), preventing JSONDecodeError during the resolve step.
Changes:
- Update
_http()to read the response body first and return{}when the body is empty instead of unconditionally callingjson.loads(). - Apply the same empty-body handling for
HTTPErrorresponse bodies.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Member
Author
|
Merged into master (cd8ba63). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
JSONDecodeErrorwhen JIRA transition API returns empty response body{}instead of attempting to parse empty stringContext
After merging PR #5183, the JIRA resolve step crashed with
JSONDecodeError: Expecting value: line 1 column 1. The JIRA transition API returns HTTP 204 (No Content) on success, but_http()unconditionally calledjson.loads()on the empty body.Test plan
python3 dev/merge_pr.py --pr <number> --resolve-jira --dry-runto verify no regression