diff options
| author | Jon Skeet <skeet@pobox.com> | 2015-08-08 07:24:57 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-08-08 07:24:57 +0100 |
| commit | cac45313235bd11b08e0803453a2ec5a7d4b652a (patch) | |
| tree | b513d3030e013c59fc2a2ef4df0be6a0509b5dc9 /csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs | |
| parent | b76b76ba4f5152550fd334a6f3533d4db208f633 (diff) | |
| parent | 6e16037c9933e175f62feb445ff8bd22d7727285 (diff) | |
| download | protobuf-cac45313235bd11b08e0803453a2ec5a7d4b652a.tar.gz protobuf-cac45313235bd11b08e0803453a2ec5a7d4b652a.tar.bz2 protobuf-cac45313235bd11b08e0803453a2ec5a7d4b652a.zip | |
Merge pull request #694 from jskeet/groups
Fix groups handling in C#
Diffstat (limited to 'csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs index ea8b1055..1e8a8236 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs @@ -139,10 +139,7 @@ namespace Google.Protobuf.WellKnownTypes { while ((tag = input.ReadTag()) != 0) { switch(tag) { default: - if (pb::WireFormat.IsEndGroupTag(tag)) { - return; - } - input.ConsumeLastField(); + input.SkipLastField(); break; case 10: { fields_.AddEntriesFrom(input, _map_fields_codec); @@ -392,10 +389,7 @@ namespace Google.Protobuf.WellKnownTypes { while ((tag = input.ReadTag()) != 0) { switch(tag) { default: - if (pb::WireFormat.IsEndGroupTag(tag)) { - return; - } - input.ConsumeLastField(); + input.SkipLastField(); break; case 8: { kind_ = input.ReadEnum(); @@ -520,10 +514,7 @@ namespace Google.Protobuf.WellKnownTypes { while ((tag = input.ReadTag()) != 0) { switch(tag) { default: - if (pb::WireFormat.IsEndGroupTag(tag)) { - return; - } - input.ConsumeLastField(); + input.SkipLastField(); break; case 10: { values_.AddEntriesFrom(input, _repeated_values_codec); |