Tests and fixes for double-enumeration on AddRange and adding of null to PopsicleList

1 files changed, 2 insertions, 2 deletions

diff --git a/src/ProtoGen/RepeatedEnumFieldGenerator.cs b/src/ProtoGen/RepeatedEnumFieldGenerator.cs
index 5880390b..339e8181 100644
--- a/src/ProtoGen/RepeatedEnumFieldGenerator.cs
+++ b/src/ProtoGen/RepeatedEnumFieldGenerator.cs
@@ -88,7 +88,7 @@ namespace Google.ProtocolBuffers.ProtoGen
             writer.WriteLine("  return this;");

             writer.WriteLine("}");

             writer.WriteLine("public Builder AddRange{0}(scg::IEnumerable<{1}> values) {{", PropertyName, TypeName);

-            writer.WriteLine("  base.AddRange(values, result.{0}_);", Name);

+            writer.WriteLine("  result.{0}_.Add(values);", Name);

             writer.WriteLine("  return this;");

             writer.WriteLine("}");

             writer.WriteLine("public Builder Clear{0}() {{", PropertyName);

@@ -100,7 +100,7 @@ namespace Google.ProtocolBuffers.ProtoGen
         public void GenerateMergingCode(TextGenerator writer)

         {

             writer.WriteLine("if (other.{0}_.Count != 0) {{", Name);

-            writer.WriteLine("  base.AddRange(other.{0}_, result.{0}_);", Name);

+            writer.WriteLine("  result.{0}_.Add(other.{0}_);", Name);

             writer.WriteLine("}");

         }