2007-04-12 Marek Habersack <mhabersack@novell.com>

	* SectionGroupInfo.cs: a better fix for #81321

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

diff --git a/mcs/class/System.Configuration/System.Configuration/ChangeLog b/mcs/class/System.Configuration/System.Configuration/ChangeLog
index 9edcd15fd88d3bc087f5e7827663bd5102d476ca..ace3f416c7f4f88c17ce7805eb1a23919b730ca6 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-12  Marek Habersack  <mhabersack@novell.com>
+
+       * SectionGroupInfo.cs: a better fix for #81321
+
 2007-04-10  Marek Habersack  <mhabersack@novell.com>
 
        * SectionGroupInfo.cs: make sure empty sections with the

diff --git a/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs b/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs
index 9e48979fdcbabca6169ede01ab6e1d86681a8f6b..9a11ec12c30fe7bc3ade9bdd5e5b05541a0d107e 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs
+++ b/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs
@@ -280,8 +280,13 @@ namespace System.Configuration
                
                void ReadContent (XmlTextReader reader, Configuration config, bool overrideAllowed, bool root)
                {
+                       if (reader.IsEmptyElement) {
+                               reader.Skip ();
+                               return;
+                       }
+                       
                        StringBuilder spacing = new StringBuilder ();
-                       while (reader.NodeType != XmlNodeType.EndElement && reader.NodeType != XmlNodeType.None) {
+                       while (reader.NodeType != XmlNodeType.EndElement) {
                                if (reader.NodeType != XmlNodeType.Element) {
                                        if (reader.NodeType == XmlNodeType.Whitespace)
                                                spacing.Append (reader.Value);