diff options
| author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-08-05 17:16:13 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-08-05 17:16:13 -0700 |
| commit | ad8a889d1e1e2b0efd5b7579aa57ea5326cda6da (patch) | |
| tree | 48e9e14f18ee1ff081df8d26a361665b9d458f74 /csharp/src/Google.Protobuf.Conformance | |
| parent | 607940321c8ceeb80ec1099d94add8eef86825e5 (diff) | |
| parent | 38032688a7faf4eef2cac392b9e69697a202fe62 (diff) | |
| download | protobuf-ad8a889d1e1e2b0efd5b7579aa57ea5326cda6da.tar.gz protobuf-ad8a889d1e1e2b0efd5b7579aa57ea5326cda6da.tar.bz2 protobuf-ad8a889d1e1e2b0efd5b7579aa57ea5326cda6da.zip | |
Merge pull request #692 from jskeet/tag-0
Change ReadTag/PeekTag behaviour to return 0 at EOF
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance')
| -rw-r--r-- | csharp/src/Google.Protobuf.Conformance/Conformance.cs | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/csharp/src/Google.Protobuf.Conformance/Conformance.cs b/csharp/src/Google.Protobuf.Conformance/Conformance.cs index db0c1225..50a6756c 100644 --- a/csharp/src/Google.Protobuf.Conformance/Conformance.cs +++ b/csharp/src/Google.Protobuf.Conformance/Conformance.cs @@ -318,10 +318,8 @@ namespace Conformance { public void MergeFrom(pb::CodedInputStream input) { uint tag; - while (input.ReadTag(out tag)) { + while ((tag = input.ReadTag()) != 0) { switch(tag) { - case 0: - throw pb::InvalidProtocolBufferException.InvalidTag(); default: if (pb::WireFormat.IsEndGroupTag(tag)) { return; @@ -556,10 +554,8 @@ namespace Conformance { public void MergeFrom(pb::CodedInputStream input) { uint tag; - while (input.ReadTag(out tag)) { + while ((tag = input.ReadTag()) != 0) { switch(tag) { - case 0: - throw pb::InvalidProtocolBufferException.InvalidTag(); default: if (pb::WireFormat.IsEndGroupTag(tag)) { return; @@ -1830,10 +1826,8 @@ namespace Conformance { public void MergeFrom(pb::CodedInputStream input) { uint tag; - while (input.ReadTag(out tag)) { + while ((tag = input.ReadTag()) != 0) { switch(tag) { - case 0: - throw pb::InvalidProtocolBufferException.InvalidTag(); default: if (pb::WireFormat.IsEndGroupTag(tag)) { return; @@ -2259,10 +2253,8 @@ namespace Conformance { public void MergeFrom(pb::CodedInputStream input) { uint tag; - while (input.ReadTag(out tag)) { + while ((tag = input.ReadTag()) != 0) { switch(tag) { - case 0: - throw pb::InvalidProtocolBufferException.InvalidTag(); default: if (pb::WireFormat.IsEndGroupTag(tag)) { return; @@ -2378,10 +2370,8 @@ namespace Conformance { public void MergeFrom(pb::CodedInputStream input) { uint tag; - while (input.ReadTag(out tag)) { + while ((tag = input.ReadTag()) != 0) { switch(tag) { - case 0: - throw pb::InvalidProtocolBufferException.InvalidTag(); default: if (pb::WireFormat.IsEndGroupTag(tag)) { return; |