Merge pull request #1101 from Unity-Technologies/implement-read-string

joshpeterson · web-flow · commit e1b2f9844110 · 2018-12-12T07:48:51.000-05:00
Implement a ReadString overload (case 1106236)
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
@@ -1193,10 +1193,15 @@ protected Exception CreateMissingIXmlSerializableType (string name, string ns, s
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
 		protected string ReadString (string value, bool trim)
 		{
-			throw new NotImplementedException ();
+			readCount++;
+			string str = reader.ReadString ();
+			if (str != null && trim)
+				str = str.Trim();
+			if (value == null || value.Length == 0)
+				return str;
+			return value + str;
 		}
 		
 		[MonoTODO]

Original file line number	Diff line number	Diff line change
`@@ -1193,10 +1193,15 @@ protected Exception CreateMissingIXmlSerializableType (string name, string ns, s`
`1193`	`1193`	`throw new NotImplementedException ();`
`1194`	`1194`	`}`
`1195`	`1195`
`1196`		`- [MonoTODO]`
`1197`	`1196`	`protected string ReadString (string value, bool trim)`
`1198`	`1197`	`{`
`1199`		`- throw new NotImplementedException ();`
	`1198`	`+ readCount++;`
	`1199`	`+ string str = reader.ReadString ();`
	`1200`	`+ if (str != null && trim)`
	`1201`	`+ str = str.Trim();`
	`1202`	`+ if (value == null \|\| value.Length == 0)`
	`1203`	`+ return str;`
	`1204`	`+ return value + str;`
`1200`	`1205`	`}`
`1201`	`1206`
`1202`	`1207`	`[MonoTODO]`