|
|
@ -159,14 +159,17 @@ namespace Google.Protobuf |
|
|
|
internal void MergeFrom(IMessage message, CodedInputStream codedInput) |
|
|
|
internal void MergeFrom(IMessage message, CodedInputStream codedInput) |
|
|
|
{ |
|
|
|
{ |
|
|
|
bool originalDiscard = codedInput.DiscardUnknownFields; |
|
|
|
bool originalDiscard = codedInput.DiscardUnknownFields; |
|
|
|
|
|
|
|
ExtensionRegistry originalRegistry = codedInput.ExtensionRegistry; |
|
|
|
try |
|
|
|
try |
|
|
|
{ |
|
|
|
{ |
|
|
|
codedInput.DiscardUnknownFields = DiscardUnknownFields; |
|
|
|
codedInput.DiscardUnknownFields = DiscardUnknownFields; |
|
|
|
|
|
|
|
codedInput.ExtensionRegistry = Extensions; |
|
|
|
message.MergeFrom(codedInput); |
|
|
|
message.MergeFrom(codedInput); |
|
|
|
} |
|
|
|
} |
|
|
|
finally |
|
|
|
finally |
|
|
|
{ |
|
|
|
{ |
|
|
|
codedInput.DiscardUnknownFields = originalDiscard; |
|
|
|
codedInput.DiscardUnknownFields = originalDiscard; |
|
|
|
|
|
|
|
codedInput.ExtensionRegistry = originalRegistry; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|