Skip to content

Commit

Permalink
Internal changes
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 665658096
  • Loading branch information
mkruskal-google authored and copybara-github committed Aug 21, 2024
1 parent e65ff23 commit 5cbf13b
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions java/core/src/main/java/com/google/protobuf/Descriptors.java
Original file line number Diff line number Diff line change
Expand Up @@ -2805,9 +2805,10 @@ void resolveFeatures(FeatureSet unresolvedFeatures) throws DescriptorValidationE
}
boolean hasPossibleUnknownJavaFeature =
!unresolvedFeatures.getUnknownFields().isEmpty()
&& unresolvedFeatures
.getUnknownFields()
.hasField(JavaFeaturesProto.java_.getNumber());
&& (unresolvedFeatures
.getUnknownFields()
.hasField(JavaFeaturesProto.java_.getNumber())
);
if (hasPossibleCustomJavaFeature || hasPossibleUnknownJavaFeature) {
ExtensionRegistry registry = ExtensionRegistry.newInstance();
registry.add(JavaFeaturesProto.java_);
Expand Down

0 comments on commit 5cbf13b

Please sign in to comment.