2005-06-17 Jordi Mas i Hernandez <jordi@ximian.com>

	* DataViewManager.cs: fixes exception and creates DataView

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

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index ca3f7c087fd20f6866281df8ade01deed9aebe23..baaed90f0a6c9a705614581f21b7c1c0e0c25958 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-17  Jordi Mas i Hernandez <jordi@ximian.com>
+
+       * DataViewManager.cs: fixes exception and creates DataView
+
 2005-06-15  Sureshkumar T  <tsureshkumar@novell.com>
 
        * DataRow.cs: CheckChildRows: cascade parent changes to child rows

diff --git a/mcs/class/System.Data/System.Data/DataViewManager.cs b/mcs/class/System.Data/System.Data/DataViewManager.cs
index 9a2f6788a4543971aef8b6b631263ff33f3d9c06..4e7e2cb3b042654ad0b417997f9849e166368233 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataViewManager.cs
+++ b/mcs/class/System.Data/System.Data/DataViewManager.cs
@@ -282,8 +282,12 @@ namespace System.Data
 \r
                public DataView CreateDataView (DataTable table) \r
                {\r
-                       DataViewSetting s = settings [table];\r
-                       return new DataView (table, this, s.Sort, s.RowFilter, s.RowStateFilter);\r
+                       if (settings [table] != null) {\r
+                               DataViewSetting s = settings [table];\r
+                               return new DataView (table, this, s.Sort, s.RowFilter, s.RowStateFilter);\r
+                       } else {\r
+                               return new DataView (table);\r
+                       }\r
                }\r
 \r
                [MonoTODO]\r