* DataSet.cs :

  - CaseSensitive : Additional fix (removed unnesessary assignment).
  - CopyProperties : Do not try to copy ExtendedProperties if the collection is empty.

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

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 58cef6c2785ebc07c5418e7ea2a0926658d9f277..54561713850aa28f6d428daa7b6238d69819b1c7 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-21  Boris Kirzner <borisk@mainsoft.com>
+
+       * DataSet.cs : 
+         - CaseSensitive : Additional fix (removed unnesessary assignment).
+         - CopyProperties : Do not try to copy ExtendedProperties if the collection is empty.
+
 2004-04-21  Boris Kirzner <borisk@mainsoft.com>
 
        * DataTable.cs : Ensure that DataSet property is not null before using it in Clear().

diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs
index f5e57f7d1cee9ff0feb1e500422412a5afd3576d..741c6a2b74738a50f467a028ca6b225e1cc1fc52 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataSet.cs
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -81,11 +81,6 @@ namespace System.Data {
                                return caseSensitive;
                        } 
                        set {
-                               foreach (DataTable T in Tables) {
-                                       if (T.VirginCaseSensitive)
-                                               T.CaseSensitive = value;
-                               }
-
                                caseSensitive = value; 
                                if (!caseSensitive) {
                                        foreach (DataTable table in Tables) {
@@ -357,12 +352,14 @@ namespace System.Data {
                        //Copy.DefaultViewManager
                        //Copy.DesignMode
                        Copy.EnforceConstraints = EnforceConstraints;
-                       //  Cannot copy extended properties directly as the property does not have a set accessor
-                       Array tgtArray = Array.CreateInstance( typeof (object), ExtendedProperties.Count);
-                       ExtendedProperties.Keys.CopyTo (tgtArray, 0);
-                       for (int i=0; i < ExtendedProperties.Count; i++)
-                               Copy.ExtendedProperties.Add (tgtArray.GetValue (i), ExtendedProperties[tgtArray.GetValue (i)]);
-                        Copy.Locale = Locale;
+                       if(ExtendedProperties.Count > 0) {
+                               //  Cannot copy extended properties directly as the property does not have a set accessor
+                Array tgtArray = Array.CreateInstance( typeof (object), ExtendedProperties.Count);
+                ExtendedProperties.Keys.CopyTo (tgtArray, 0);
+                for (int i=0; i < ExtendedProperties.Count; i++)
+                                       Copy.ExtendedProperties.Add (tgtArray.GetValue (i), ExtendedProperties[tgtArray.GetValue (i)]);
+                       }
+            Copy.Locale = Locale;
                        Copy.Namespace = Namespace;
                        Copy.Prefix = Prefix;                   
                        //Copy.Site = Site; // FIXME : Not sure of this.