Author: atsushi
Date: 2006-01-30 03:15:51 -0500 (Mon, 30 Jan 2006)
New Revision: 56240
Modified:
trunk/mcs/class/System.XML/System.Xml/ChangeLog
trunk/mcs/class/System.XML/System.Xml/XmlReader.cs
Log:
2006-01-30 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlReader.cs : ReadOuterXml() returns meaingful value only for
element and attribute. ReadInnerXml() does not have to create
XmlTextWriter for empty elements.
Modified: trunk/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/ChangeLog 2006-01-30 08:10:05 UTC
(rev 56239)
+++ trunk/mcs/class/System.XML/System.Xml/ChangeLog 2006-01-30 08:15:51 UTC
(rev 56240)
@@ -1,5 +1,11 @@
2006-01-30 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * XmlReader.cs : ReadOuterXml() returns meaingful value only for
+ element and attribute. ReadInnerXml() does not have to create
+ XmlTextWriter for empty elements.
+
+2006-01-30 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* XmlNodeReader2.cs XmlException.cs XmlReader.cs XmlTextReader.cs
XmlWriter.cs XmlTextWriter.cs XmlValidatingReader.cs
XmlNodeReaderImpl.cs DTDValidatingReader.cs XmlSecureResolver.cs:
Modified: trunk/mcs/class/System.XML/System.Xml/XmlReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlReader.cs 2006-01-30 08:10:05 UTC
(rev 56239)
+++ trunk/mcs/class/System.XML/System.Xml/XmlReader.cs 2006-01-30 08:15:51 UTC
(rev 56240)
@@ -652,13 +652,13 @@
if (ReadState != ReadState.Interactive || NodeType ==
XmlNodeType.EndElement)
return String.Empty;
+ if (IsEmptyElement) {
+ Read ();
+ return String.Empty;
+ }
StringWriter sw = new StringWriter ();
XmlTextWriter xtw = new XmlTextWriter (sw);
if (NodeType == XmlNodeType.Element) {
- if (IsEmptyElement) {
- Read ();
- return String.Empty;
- }
int startDepth = Depth;
Read ();
while (startDepth < Depth) {
@@ -680,10 +680,17 @@
if (ReadState != ReadState.Interactive || NodeType ==
XmlNodeType.EndElement)
return String.Empty;
- StringWriter sw = new StringWriter ();
- XmlTextWriter xtw = new XmlTextWriter (sw);
- xtw.WriteNode (this, false);
- return sw.ToString ();
+ switch (NodeType) {
+ case XmlNodeType.Element:
+ case XmlNodeType.Attribute:
+ StringWriter sw = new StringWriter ();
+ XmlTextWriter xtw = new XmlTextWriter (sw);
+ xtw.WriteNode (this, false);
+ return sw.ToString ();
+ default:
+ Skip ();
+ return String.Empty;
+ }
}
public virtual void ReadStartElement ()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches