From 20bfd9bf5015b21adab17fce4bd78510f25137d9 Mon Sep 17 00:00:00 2001
From: Jon Skeet <skeet@pobox.com>
Date: Thu, 23 Oct 2008 21:05:58 +0100
Subject: Fix bug in GeneratedBuilder.MergeFrom

---
 src/ProtocolBuffers/GeneratedBuilder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ProtocolBuffers')

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
-- 
cgit v1.2.3