More refactoring

google · Sep 12, 2022 · aa492a9 · aa492a9
1 parent 1dddc1b
commit aa492a9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/protobuf/lib/src/protobuf/field_set.dart b/protobuf/lib/src/protobuf/field_set.dart
@@ -786,12 +786,12 @@ class _FieldSet {
 
     if (fi.isGroupOrMessage) {
       final currentFieldValue = _values[fi.index!];
+      final GeneratedMessage msg = fieldValue;
       if (currentFieldValue == null) {
-        final GeneratedMessage msg = fieldValue;
         fieldValue = msg.deepCopy();
       } else {
         final GeneratedMessage currentMsg = currentFieldValue;
-        fieldValue = currentMsg..mergeFromMessage(fieldValue);
+        fieldValue = currentMsg..mergeFromMessage(msg);
       }
     }