commit 17729cc5e50bf9ca68361aca03905c3d32749f74
author Sandy Zhang <sandyzhang@google.com> Wed Jan 24 12:31:28 2024 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Jan 24 12:33:34 2024 -0800
tree 74945409d30eb39aed26af9bc284b76b2157f38c
parent 570c386f5e3bc79f29733cd7489c80cdc410f6f1

Call ExtensionRegistry.add for JavaFeaturesProto.java directly.

PiperOrigin-RevId: 601200193

java/core/src/main/java/com/google/protobuf/Descriptors.java

diff --git a/java/core/src/main/java/com/google/protobuf/Descriptors.java b/java/core/src/main/java/com/google/protobuf/Descriptors.java
index dff3228..76412aa 100644
--- a/java/core/src/main/java/com/google/protobuf/Descriptors.java
+++ b/java/core/src/main/java/com/google/protobuf/Descriptors.java
@@ -87,7 +87,7 @@
         if (javaEditionDefaults == null) {
           try {
             ExtensionRegistry registry = ExtensionRegistry.newInstance();
-            JavaFeaturesProto.registerAllExtensions(registry);
+            registry.add(JavaFeaturesProto.java);
             javaEditionDefaults =
                 FeatureSetDefaults.parseFrom(
                     JavaEditionDefaults.PROTOBUF_INTERNAL_JAVA_EDITION_DEFAULTS.getBytes(