2004-10-12 Atsushi Enomoto <atsushi@ximian.com>

	* DataSet.cs : DBNull attribute column should not be written as
	  empty attribute. This fixes bug #68007.

svn path=/trunk/mcs/; revision=34907

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index d5dc0e34c9a828f84c031d6b08874feba22893d4..416ccbc4fa2dea87a5a6818258ec597af1ff8ba4 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-12  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DataSet.cs : DBNull attribute column should not be written as
+         empty attribute. This fixes bug #68007.
+
 2004-10-12  Atsushi Enomoto  <atsushi@ximian.com>
 
        * DataSet.cs, XmlConstant.cs, XmlSchemaDataImporter.cs:

diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs
index 867445add2c2979c0b2a2c45ddaa543471eb3126..727e866a34f50a87192da52e01155f25afaffaa4 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataSet.cs
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -1282,7 +1282,8 @@ namespace System.Data {
 
                private void WriteColumnAsAttribute (XmlWriter writer, XmlWriteMode mode, DataColumn col, DataRow row, DataRowVersion version)
                {
-                       WriteAttributeString (writer, mode, col.Namespace, col.Prefix, XmlConvert.EncodeLocalName (col.ColumnName), WriteObjectXml (row[col, version]));
+                       if (!row.IsNull (col))
+                               WriteAttributeString (writer, mode, col.Namespace, col.Prefix, XmlConvert.EncodeLocalName (col.ColumnName), WriteObjectXml (row[col, version]));
                }
 
                private void WriteTableElement (XmlWriter writer, XmlWriteMode mode, DataTable table, DataRow row, DataRowVersion version)