diff options
Diffstat (limited to 'csharp/ProtocolBuffers/AbstractBuilder.cs')
| -rw-r--r-- | csharp/ProtocolBuffers/AbstractBuilder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/ProtocolBuffers/AbstractBuilder.cs b/csharp/ProtocolBuffers/AbstractBuilder.cs index f0561823..a83afa6e 100644 --- a/csharp/ProtocolBuffers/AbstractBuilder.cs +++ b/csharp/ProtocolBuffers/AbstractBuilder.cs @@ -155,7 +155,7 @@ namespace Google.ProtocolBuffers { public virtual TBuilder MergeFrom(CodedInputStream input, ExtensionRegistry extensionRegistry) { UnknownFieldSet.Builder unknownFields = UnknownFieldSet.CreateBuilder(UnknownFields); - FieldSet.MergeFrom(input, unknownFields, extensionRegistry, this); + unknownFields.MergeFrom(input, extensionRegistry, this); UnknownFields = unknownFields.Build(); return ThisBuilder; } |