Copy from 72246 to trunk

[mono.git] / mcs / class / System.Configuration / System.Configuration / Configuration.cs

diff --git a/mcs/class/System.Configuration/System.Configuration/Configuration.cs b/mcs/class/System.Configuration/System.Configuration/Configuration.cs
index 54e083f7200705305ea3c0a8c3dbb3c56d5e57ca..19d71b61434779b30576617bbb2e38852950d701 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/Configuration.cs
+++ b/mcs/class/System.Configuration/System.Configuration/Configuration.cs
@@ -54,7 +54,9 @@ namespace System.Configuration {
                        
                internal Configuration (Configuration parent)
                {
-                       Init (parent.system, null, parent);
+                       this.parent = parent;
+                       this.system = parent.system;
+                       this.rootGroup = parent.rootGroup;
                }
                
                internal Configuration (InternalConfigurationSystem system, string locationSubPath)
@@ -109,7 +111,7 @@ namespace System.Configuration {
                                rootGroup.StreamName = streamName;
                        }
                        
-                       if (configPath != null)
+                       if (streamName != null)
                                Load ();
                }
                
@@ -467,7 +469,7 @@ namespace System.Configuration {
                
                internal void ReadData (XmlTextReader reader, bool allowOverride)
                {
-                       rootGroup.ReadRootData (reader, this, allowOverride);
+                       rootGroup.ReadData (this, reader, allowOverride);
                }