diff options
author | Jon Skeet <skeet@pobox.com> | 2008-10-23 21:05:58 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2008-10-23 21:05:58 +0100 |
commit | 20bfd9bf5015b21adab17fce4bd78510f25137d9 (patch) | |
tree | 7ef5e47fd4e5c579b7daa8496fe9da465228302a /src/ProtocolBuffers | |
parent | b8c2fc57fc4711293e487c6a8df95de5188f9c28 (diff) | |
download | protobuf-20bfd9bf5015b21adab17fce4bd78510f25137d9.tar.gz protobuf-20bfd9bf5015b21adab17fce4bd78510f25137d9.tar.bz2 protobuf-20bfd9bf5015b21adab17fce4bd78510f25137d9.zip |
Fix bug in GeneratedBuilder.MergeFrom
Diffstat (limited to 'src/ProtocolBuffers')
-rw-r--r-- | src/ProtocolBuffers/GeneratedBuilder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ProtocolBuffers/GeneratedBuilder.cs b/src/ProtocolBuffers/GeneratedBuilder.cs index 4f577a79..2005d9ee 100644 --- a/src/ProtocolBuffers/GeneratedBuilder.cs +++ b/src/ProtocolBuffers/GeneratedBuilder.cs @@ -113,7 +113,7 @@ namespace Google.ProtocolBuffers { throw new ArgumentException("Message type mismatch"); } - foreach (KeyValuePair<FieldDescriptor, object> entry in AllFields) { + foreach (KeyValuePair<FieldDescriptor, object> entry in other.AllFields) { FieldDescriptor field = entry.Key; if (field.IsRepeated) { // Concatenate repeated fields |