commit 20bfd9bf5015b21adab17fce4bd78510f25137d9
author Jon Skeet <skeet@pobox.com> Thu Oct 23 21:05:58 2008 +0100
committer Jon Skeet <skeet@pobox.com> Thu Oct 23 21:05:58 2008 +0100
tree 7ef5e47fd4e5c579b7daa8496fe9da465228302a
parent b8c2fc57fc4711293e487c6a8df95de5188f9c28

Fix bug in GeneratedBuilder.MergeFrom

src/ProtocolBuffers/GeneratedBuilder.cs

diff --git a/src/ProtocolBuffers/GeneratedBuilder.cs b/src/ProtocolBuffers/GeneratedBuilder.cs
index 4f577a7..2005d9e 100644
--- a/src/ProtocolBuffers/GeneratedBuilder.cs
+++ b/src/ProtocolBuffers/GeneratedBuilder.cs
@@ -113,7 +113,7 @@
         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