From c7a006a225e0b94b639a9be694b03c835f4db6d6 Mon Sep 17 00:00:00 2001
From: Sandy Zhang <sandyzhang@google.com>
Date: Mon, 17 Jun 2024 11:45:51 -0400
Subject: [PATCH] Fix checking unknown field set empty which wasn't exposed yet
 in 27.x

---
 java/core/src/main/java/com/google/protobuf/Descriptors.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 569fa26e0e66..877cb081037b 100644
--- a/java/core/src/main/java/com/google/protobuf/Descriptors.java
+++ b/java/core/src/main/java/com/google/protobuf/Descriptors.java
@@ -2804,7 +2804,7 @@ void resolveFeatures(FeatureSet unresolvedFeatures) throws DescriptorValidationE
         }
       }
       boolean hasPossibleUnknownJavaFeature =
-          !unresolvedFeatures.getUnknownFields().isEmpty()
+          !unresolvedFeatures.getUnknownFields().asMap().isEmpty()
               && unresolvedFeatures
                   .getUnknownFields()
                   .hasField(JavaFeaturesProto.java_.getNumber());