Automated rollback of commit 30b6251dea.

PiperOrigin-RevId: 586513152
pull/14893/head
Sandy Zhang 1 year ago committed by Mike Kruskal
parent 3e61525e6b
commit 80337cb884
  1. 6
      java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java

@ -2459,11 +2459,7 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
final String containingOneofCamelCaseName) { final String containingOneofCamelCaseName) {
isOneofField = isOneofField =
descriptor.getRealContainingOneof() != null; descriptor.getRealContainingOneof() != null;
hasHasMethod = hasHasMethod = descriptor.hasPresence();
descriptor.getFile().getSyntax() == FileDescriptor.Syntax.EDITIONS && descriptor.hasPresence()
|| descriptor.getFile().getSyntax() == FileDescriptor.Syntax.PROTO2
|| descriptor.hasOptionalKeyword()
|| (!isOneofField && descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE);
ReflectionInvoker reflectionInvoker = ReflectionInvoker reflectionInvoker =
new ReflectionInvoker( new ReflectionInvoker(
descriptor, descriptor,

Loading…
Cancel
Save