Avoid allocating TreeMap in UnknownFieldSet.Builder.asMap

If UnknownFieldSet is empty PiperOrigin-RevId: 632504647
protocolbuffers · May 10, 2024 · 4b7c2d4 · 4b7c2d4
1 parent 8c6e5b7
commit 4b7c2d4
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java b/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
@@ -483,6 +483,11 @@ public Builder addField(int number, Field field) {
      * changes may or may not be reflected in this map.
      */
     public Map<Integer, Field> asMap() {
+      // Avoid an allocation for the common case of an empty map.
+      if (fieldBuilders.isEmpty()) {
+        return Collections.emptyMap();
+      }
+
       TreeMap<Integer, Field> fields = new TreeMap<>();
       for (Map.Entry<Integer, Field.Builder> entry : fieldBuilders.entrySet()) {
         fields.put(entry.getKey(), entry.getValue().build());