Skip to content

Fix serialization issue with DataContractJsonSerializer UseSimpleDictionaryFormat (case 1070667) #1140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2019
Merged

Fix serialization issue with DataContractJsonSerializer UseSimpleDictionaryFormat (case 1070667) #1140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion mcs/class/System.Runtime.Serialization/ReferenceSources/JsonFormatReaderGenerator_static.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,9 @@ void ReadSimpleDictionary (CollectionDataContract collectionContract, Type keyVa
var jsonMemberName = XmlObjectSerializerReadContextComplexJson.GetJsonMemberName (xmlReader);
object key = null;

if (keyParseMode == KeyParseMode.UsingParseEnum)
if (keyParseMode == KeyParseMode.AsString)
key = jsonMemberName;
else if (keyParseMode == KeyParseMode.UsingParseEnum)
key = Enum.Parse (keyType, jsonMemberName);
else if (keyParseMode == KeyParseMode.UsingCustomParse)
key = keyDataContract.ParseMethod.Invoke (null, new object [] {jsonMemberName});
Expand Down