Author: anagappan
Date: 2007-02-23 01:32:33 -0500 (Fri, 23 Feb 2007)
New Revision: 73346
Modified:
trunk/mcs/class/System.Data/System.Data/ChangeLog
trunk/mcs/class/System.Data/System.Data/XmlDataLoader.cs
trunk/mcs/class/System.Data/System.Data/XmlDataReader.cs
Log:
2007-02-23 Nagappan A <[EMAIL PROTECTED]>
* XmlDataReader.cs (StringToObject): DataTables containing
System.Type throw exception on deserializing. Fixes bug # 80596.
* XmlDataLoader.cs (StringToObject): DataTables containing
System.Type throw exception on deserializing. Fixes bug # 80596.
Modified: trunk/mcs/class/System.Data/System.Data/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data/ChangeLog 2007-02-23 03:21:20 UTC
(rev 73345)
+++ trunk/mcs/class/System.Data/System.Data/ChangeLog 2007-02-23 06:32:33 UTC
(rev 73346)
@@ -1,3 +1,11 @@
+2007-02-23 Nagappan A <[EMAIL PROTECTED]>
+
+ * XmlDataReader.cs (StringToObject): DataTables containing
+ System.Type throw exception on deserializing. Fixes bug # 80596.
+
+ * XmlDataLoader.cs (StringToObject): DataTables containing
+ System.Type throw exception on deserializing. Fixes bug # 80596.
+
2007-02-20 Konstantin Triger <[EMAIL PROTECTED]>
* XmlSchemaDataImporter.cs: ensure the tables are created in document
order.
Modified: trunk/mcs/class/System.Data/System.Data/XmlDataLoader.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data/XmlDataLoader.cs 2007-02-23
03:21:20 UTC (rev 73345)
+++ trunk/mcs/class/System.Data/System.Data/XmlDataLoader.cs 2007-02-23
06:32:33 UTC (rev 73346)
@@ -228,6 +228,7 @@
if (type == typeof (TimeSpan)) return
XmlConvert.ToTimeSpan (value);
if (type == typeof (Guid)) return XmlConvert.ToGuid
(value);
if (type == typeof (byte[])) return
Convert.FromBase64String (value);
+ if (type == typeof (System.Type)) return
System.Type.GetType (value);
return Convert.ChangeType (value, type);
}
@@ -236,7 +237,7 @@
{
Hashtable rowValue = new Hashtable();
DataTable table;
-
+
// Check if the table exists in the DataSet. If not
create one.
if (DSet.Tables.Contains(tableNode.LocalName))
table = DSet.Tables[tableNode.LocalName];
Modified: trunk/mcs/class/System.Data/System.Data/XmlDataReader.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data/XmlDataReader.cs 2007-02-23
03:21:20 UTC (rev 73345)
+++ trunk/mcs/class/System.Data/System.Data/XmlDataReader.cs 2007-02-23
06:32:33 UTC (rev 73346)
@@ -371,6 +371,7 @@
if (type == typeof (TimeSpan)) return
XmlConvert.ToTimeSpan (value);
if (type == typeof (Guid)) return XmlConvert.ToGuid
(value);
if (type == typeof (byte[])) return
Convert.FromBase64String (value);
+ if (type == typeof (System.Type)) return
System.Type.GetType (value);
return Convert.ChangeType (value, type);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
