Merge pull request dotnet/corefx#2909 from shmao/ncl

shmao · shmao · commit 3c9fb16c54c4 · 2015-08-20T23:58:33.000-07:00
Fixed a loss of streamed bytes issue. Commit migrated from dotnet/corefx@563f5de
diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Xml/XmlBaseReader.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Xml/XmlBaseReader.cs
@@ -832,6 +832,12 @@ public override XmlNodeType MoveToContent()
                 {
                     if (_node.NodeType != XmlNodeType.Text && _node.NodeType != XmlNodeType.CDATA)
                         break;
+
+                    if (_trailByteCount > 0)
+                    {
+                        break;
+                    }
+
                     if (_value == null)
                     {
                         if (!_node.Value.IsWhitespace())

Original file line number	Diff line number	Diff line change
`@@ -832,6 +832,12 @@ public override XmlNodeType MoveToContent()`
`832`	`832`	`{`
`833`	`833`	`if (_node.NodeType != XmlNodeType.Text && _node.NodeType != XmlNodeType.CDATA)`
`834`	`834`	`break;`
	`835`	`+`
	`836`	`+ if (_trailByteCount > 0)`
	`837`	`+ {`
	`838`	`+ break;`
	`839`	`+ }`
	`840`	`+`
`835`	`841`	`if (_value == null)`
`836`	`842`	`{`
`837`	`843`	`if (!_node.Value.IsWhitespace())`