More refactoring

osa1 · osa1 · commit aa492a9c896f · 2022-09-12T15:04:02.000+02:00
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);
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -786,12 +786,12 @@ class _FieldSet {`
`786`	`786`
`787`	`787`	`if (fi.isGroupOrMessage) {`
`788`	`788`	`final currentFieldValue = _values[fi.index!];`
	`789`	`+ final GeneratedMessage msg = fieldValue;`
`789`	`790`	`if (currentFieldValue == null) {`
`790`		`- final GeneratedMessage msg = fieldValue;`
`791`	`791`	`fieldValue = msg.deepCopy();`
`792`	`792`	`} else {`
`793`	`793`	`final GeneratedMessage currentMsg = currentFieldValue;`
`794`		`- fieldValue = currentMsg..mergeFromMessage(fieldValue);`
	`794`	`+ fieldValue = currentMsg..mergeFromMessage(msg);`
`795`	`795`	`}`
`796`	`796`	`}`
`797`	`797`