aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf/Collections/MapField.cs
diff options
context:
space:
mode:
authorJon Skeet <skeet@pobox.com>2015-08-08 07:24:57 +0100
committerJon Skeet <skeet@pobox.com>2015-08-08 07:24:57 +0100
commitcac45313235bd11b08e0803453a2ec5a7d4b652a (patch)
treeb513d3030e013c59fc2a2ef4df0be6a0509b5dc9 /csharp/src/Google.Protobuf/Collections/MapField.cs
parentb76b76ba4f5152550fd334a6f3533d4db208f633 (diff)
parent6e16037c9933e175f62feb445ff8bd22d7727285 (diff)
downloadprotobuf-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/Collections/MapField.cs')
-rw-r--r--csharp/src/Google.Protobuf/Collections/MapField.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/csharp/src/Google.Protobuf/Collections/MapField.cs b/csharp/src/Google.Protobuf/Collections/MapField.cs
index 5eb2c2fc..dc4b04cb 100644
--- a/csharp/src/Google.Protobuf/Collections/MapField.cs
+++ b/csharp/src/Google.Protobuf/Collections/MapField.cs
@@ -637,10 +637,9 @@ namespace Google.Protobuf.Collections
{
Value = codec.valueCodec.Read(input);
}
- else if (WireFormat.IsEndGroupTag(tag))
+ else
{
- // TODO(jonskeet): Do we need this? (Given that we don't support groups...)
- return;
+ input.SkipLastField();
}
}
}