Skip to content

[release/6.0] Align DCJS with 4.8 implementation. #57884

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

Closed
github-actions wants to merge 4 commits into from
Closed

[release/6.0] Align DCJS with 4.8 implementation. #57884

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76652d7
Align DCJS with 4.8 version. This work addresses #55270.
StephenMolloy Aug 16, 2021
f759632
Close() nits.
StephenMolloy Aug 16, 2021
05616b3
Remove some extraneous trimmer attributes.
StephenMolloy Aug 17, 2021
a89e0c7
Another trimmer nit.
StephenMolloy Aug 17, 2021
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
Prev Previous commit
Next Next commit
Close() nits.
  • Loading branch information
@StephenMolloy
StephenMolloy authored and github-actions committed Aug 21, 2021
commit f7596325b87d0449035f280d0ec43b49fd0971d2
3 changes: 2 additions & 1 deletion ....Private.DataContractSerialization/src/System/Runtime/Serialization/Json/XmlJsonReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@ private bool IsReadingComplexText

public override void Close()
{
base.Close();
OnXmlDictionaryReaderClose? onClose = _onReaderClose;
_onReaderClose = null;
ResetState();
Expand All @@ -354,6 +353,8 @@ public override void Close()
throw new InvalidOperationException(SR.GenericCallbackException, e);
}
}

base.Close();
}

public override void EndCanonicalization()
Expand Down
2 changes: 2 additions & 0 deletions ....Private.DataContractSerialization/src/System/Runtime/Serialization/Json/XmlJsonWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ public override void Close()
}
}
}

base.Close();
}

public override void Flush()
Expand Down