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.

Sign up for GitHub

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

Automated rollback of commit 2a55706f9d36afd1742c97fd0d611ea8af0ac3f8. #14246

Merged
merged 2 commits into from
Sep 28, 2023
Merged

Automated rollback of commit 2a55706f9d36afd1742c97fd0d611ea8af0ac3f8. #14246

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54f4c0e
Automated rollback of commit 2a55706f9d36afd1742c97fd0d611ea8af0ac3f8.
zhangskz Sep 28, 2023
59ec88e
Remove editions handling not relevant in 24.x
zhangskz Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2461,7 +2461,10 @@ public void clear(final GeneratedMessageV3.Builder<?> builder) {
final String containingOneofCamelCaseName) {
isOneofField =
descriptor.getRealContainingOneof() != null;
hasHasMethod = descriptor.hasPresence();
hasHasMethod =
descriptor.getFile().getSyntax() == FileDescriptor.Syntax.PROTO2
|| descriptor.hasOptionalKeyword()
|| (!isOneofField && descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE);
ReflectionInvoker reflectionInvoker =
new ReflectionInvoker(
descriptor,
Expand Down