Automated rollback of commit 2a55706.

PiperOrigin-RevId: 569253919
protocolbuffers · Sep 28, 2023 · 30b6251 · 30b6251 · zhangskz · Sep 28, 2023
1 parent 49f2388
commit 30b6251
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java b/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
@@ -2459,7 +2459,11 @@ public void clear(final GeneratedMessageV3.Builder<?> builder) {
           final String containingOneofCamelCaseName) {
         isOneofField =
             descriptor.getRealContainingOneof() != null;
-        hasHasMethod = descriptor.hasPresence();
+        hasHasMethod =
+            descriptor.getFile().getSyntax() == FileDescriptor.Syntax.EDITIONS && descriptor.hasPresence()
+                || descriptor.getFile().getSyntax() == FileDescriptor.Syntax.PROTO2
+                || descriptor.hasOptionalKeyword()
+                || (!isOneofField && descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE);
         ReflectionInvoker reflectionInvoker =
             new ReflectionInvoker(
                 descriptor,