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

Fix default value of enum(int) in json_util with proto2 #8835

Merged
merged 1 commit into from Aug 3, 2021

Conversation

springhack
Copy link
Contributor

@springhack springhack commented Jul 26, 2021

while using proto2 with optional and default keyword, it always return string, so fix it

@springhack
Copy link
Contributor Author

springhack commented Jul 30, 2021

update: fix typo(shoule => should)

@springhack
Copy link
Contributor Author

springhack commented Jul 31, 2021

Hi @acozzette , seems there still 2 pending checks for hours, and I can't get infomation about it, need some help, thx .

@aliRc007
Copy link

aliRc007 commented Jul 31, 2021

@springhack
Copy link
Contributor Author

springhack commented Aug 1, 2021

update: rebase master

Copy link
Member

@acozzette acozzette left a comment

Thanks for the fix! Looks good but I made just a few small comments.

src/google/protobuf/util/json_format_proto2.proto Outdated Show resolved Hide resolved
src/google/protobuf/util/json_util_test.cc Outdated Show resolved Hide resolved
@acozzette acozzette merged commit 343f778 into protocolbuffers:master Aug 3, 2021
53 of 54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c++ cla: yes release notes: yes Include this PR description in the next release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants