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, 5 deletions

diff --git a/src/ProtocolBuffers/MessageStreamIterator.cs b/src/ProtocolBuffers/MessageStreamIterator.cs
index 7bc32383..9b266fa4 100644
--- a/src/ProtocolBuffers/MessageStreamIterator.cs
+++ b/src/ProtocolBuffers/MessageStreamIterator.cs
@@ -219,13 +219,14 @@ namespace Google.ProtocolBuffers
                 CodedInputStream input = CodedInputStream.CreateInstance(stream);

                 input.SetSizeLimit(sizeLimit);

                 uint tag;

-                while ((tag = input.ReadTag()) != 0)

+                string name;

+                while (input.ReadTag(out tag, out name))

                 {

-                    if (tag != ExpectedTag)

-                    {

+                    if ((tag == 0 && name == "item") || (tag == ExpectedTag))

+                        yield return messageReader(input, extensionRegistry);

+                    else

                         throw InvalidProtocolBufferException.InvalidMessageStreamTag();

-                    }

-                    yield return messageReader(input, extensionRegistry);

+

                     input.ResetSizeCounter();

                 }

             }