AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

attempt to fix CompatibilityTests

Browse Source
This commit is contained in:
Jan Tattermusch 2020-04-14 18:16:18 +02:00
parent 638a0813b4
commit a980705bdb
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
csharp/src/Google.Protobuf/Collections/MapField.cs
View File

@ -716,8 +716,17 @@ namespace Google.Protobuf.Collections
// Read it as if we'd seen input with no data (i.e. create a "default" message).
if (Value == null)
{
ParseContext.Initialize(new ReadOnlySequence<byte>(ZeroLengthMessageStreamData), out ParseContext zeroLengthCtx);
Value = codec.valueCodec.Read(ref zeroLengthCtx);
if (ctx.state.codedInputStream != null)
{
// the decoded message might not support parsing from ParseContext, so
// we need to allow fallback to the legacy MergeFrom(CodedInputStream) parsing.
Value = codec.valueCodec.Read(new CodedInputStream(ZeroLengthMessageStreamData));
}
else
{
ParseContext.Initialize(new ReadOnlySequence<byte>(ZeroLengthMessageStreamData), out ParseContext zeroLengthCtx);
Value = codec.valueCodec.Read(ref zeroLengthCtx);
}
}
}