fix loading a SectionGroup without any section child.

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

diff --git a/mcs/class/System.Configuration/System.Configuration/ChangeLog b/mcs/class/System.Configuration/System.Configuration/ChangeLog
index 95e2ed050aaaffdca1ce68f90763ec52dd1d2cd3..37501214dcda2e9141c3639388b744a627b33054 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-11  Roei Erez  <roeie@mainsoft.com>
+
+       * SectionGroupInfo.cs: fix loading a SectionGroup without sections as childern.
+
 2008-05-05  Gonzalo Paniagua Javier <gonzalo.mono@gmail.com>
 
        * ConfigurationElement.cs: don't fail when a mandatory property is a

diff --git a/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs b/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs
index f9f33f69c3ffc01af8308062986855da0f66db7f..791da13e395240791168afa4b13a6edd1720f7a7 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs
+++ b/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs
@@ -365,7 +365,7 @@ namespace System.Configuration
                                        sections.Add (key, data.sections[key]);
                                }
                        
-                       if (data.groups != null && data.sections.Count > 0)
+                       if (data.groups != null && data.sections != null && data.sections.Count > 0)
                                foreach (string key in data.groups.AllKeys) {
                                        actInfo = groups[key];
                                        if (actInfo != null)