Canged CodedInputStream.ReadTag to use boolean result with out params to

support reading a field name rather than a field tag.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs
index 2002d8df..db26d728 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs
@@ -207,11 +207,12 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {

-        while (true) {

-          uint tag = input.ReadTag();

+        uint tag;

+        string field_name;

+        while (input.ReadTag(out tag, out field_name)) {

           switch (tag) {

             case 0: {

-              return this;

+              throw InvalidProtocolBufferException.InvalidTag();

             }

             default: {

               if (pb::WireFormat.IsEndGroupTag(tag)) {

@@ -226,6 +227,8 @@ namespace Google.ProtocolBuffers.TestProtos {
             }

           }

         }

+        

+        return this;

       }