Author: kostat
Date: 2007-05-16 02:10:13 -0400 (Wed, 16 May 2007)
New Revision: 77452

Modified:
   branches/mainsoft/gh20/mcs/class/System.Data/System.Data/ChangeLog
   branches/mainsoft/gh20/mcs/class/System.Data/System.Data/DataTable.cs
Log:
merge -r77450:77451

Modified: branches/mainsoft/gh20/mcs/class/System.Data/System.Data/ChangeLog
===================================================================
--- branches/mainsoft/gh20/mcs/class/System.Data/System.Data/ChangeLog  
2007-05-16 06:08:56 UTC (rev 77451)
+++ branches/mainsoft/gh20/mcs/class/System.Data/System.Data/ChangeLog  
2007-05-16 06:10:13 UTC (rev 77452)
@@ -1,7 +1,3 @@
-2007-05-07  Konstantin Triger <[EMAIL PROTECTED]>
-
-       * DataTable.cs: ensure the file is closed in 
DataTable.WriteXml(filename).
-
 2007-05-07  Adar Wesley <[EMAIL PROTECTED]>
 
        * ConstraintCollection.cs: added CopyTo method with strongly typed 
Constraint[] 

Modified: branches/mainsoft/gh20/mcs/class/System.Data/System.Data/DataTable.cs
===================================================================
--- branches/mainsoft/gh20/mcs/class/System.Data/System.Data/DataTable.cs       
2007-05-16 06:08:56 UTC (rev 77451)
+++ branches/mainsoft/gh20/mcs/class/System.Data/System.Data/DataTable.cs       
2007-05-16 06:10:13 UTC (rev 77452)
@@ -2462,15 +2462,9 @@
 #if NET_2_0
                private XmlWriterSettings GetWriterSettings ()
                {
-                       return GetWriterSettings (false);
-               }
-
-               private XmlWriterSettings GetWriterSettings (bool closeOutput)
-               {
                        XmlWriterSettings s = new XmlWriterSettings ();
                        s.Indent = true;
                        s.OmitXmlDeclaration = true;
-                       s.CloseOutput = closeOutput;
                        return s;
                }
 
@@ -2543,7 +2537,7 @@
                {
                        XmlWriter xw = null;
                        try {
-                               xw = XmlWriter.Create (fileName, 
GetWriterSettings (true));
+                               xw = XmlWriter.Create (fileName, 
GetWriterSettings ());
                                WriteXml (xw, mode, writeHierarchy);
                        } finally {
                                if (xw != null)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to