Automated rollback of commit 2a55706. (#14246)

* Automated rollback of commit 2a55706. PiperOrigin-RevId: 569253919 * Remove editions handling not relevant in 24.x
protocolbuffers · Sep 28, 2023 · b9cf19b · b9cf19b
1 parent e4baf96
commit b9cf19b
Showing 1 changed file with 4 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
@@ -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,