Author: kostat
Date: 2007-01-16 07:27:02 -0500 (Tue, 16 Jan 2007)
New Revision: 71126
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/System.Configuration/ChangeLog
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.cs
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.exe.config
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.exe.expected
Log:
merge -r 71123:71124
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/System.Configuration/ChangeLog
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/System.Configuration/ChangeLog
2007-01-16 12:26:17 UTC (rev 71125)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/System.Configuration/ChangeLog
2007-01-16 12:27:02 UTC (rev 71126)
@@ -1,5 +1,9 @@
2007-01-16 Konstantin Triger <[EMAIL PROTECTED]>
+ * ConfigurationElement.cs: ignore properties with null or empty name.
+
+2007-01-16 Konstantin Triger <[EMAIL PROTECTED]>
+
* ConfigurationElement.cs: Try to deserilalize an unrecognized element
by
current element, and only if failed delegate to default
collection.
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
2007-01-16 12:26:17 UTC (rev 71125)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
2007-01-16 12:27:02 UTC (rev 71126)
@@ -366,7 +366,7 @@
modified = false;
foreach (PropertyInformation prop in
ElementInformation.Properties)
- if (prop.IsRequired && !readProps.ContainsKey
(prop)) {
+ if (!String.IsNullOrEmpty(prop.Name) &&
prop.IsRequired && !readProps.ContainsKey (prop)) {
object val = OnRequiredPropertyNotFound
(prop.Name);
if (!object.Equals (val,
prop.DefaultValue)) {
prop.Value = val;
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.cs
2007-01-16 12:26:17 UTC (rev 71125)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.cs
2007-01-16 12:27:02 UTC (rev 71126)
@@ -91,7 +91,7 @@
internal set { base ["name"] = value; }
}
- [ConfigurationProperty ("", IsDefaultCollection = true)]
+ [ConfigurationProperty ("", IsDefaultCollection = true,
IsRequired = true)]
[ConfigurationCollection (typeof (UrlsCollection))]
public UrlsCollection PropertySettings {
get { return (UrlsCollection) base [String.Empty]; }
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.exe.config
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.exe.config
2007-01-16 12:26:17 UTC (rev 71125)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.exe.config
2007-01-16 12:27:02 UTC (rev 71126)
@@ -14,9 +14,11 @@
<add name1="Microsoft3" url="http://www.microsoft.com" port="0" />
<add name1="Microsoft5" url="http://www.microsoft.com" port="0" />
</group>
+ <group name="ff2">
+ </group>
<add name1="Microsoft1" url="http://www.microsoft.com" port="0" />
<add name1="Microsoft6" url="http://www.microsoft.com" port="0" />
<remove name1="Microsoft1"/>
</urls>
</MyUrls>
-</configuration>
\ No newline at end of file
+</configuration>
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.exe.expected
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.exe.expected
2007-01-16 12:26:17 UTC (rev 71125)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.exe.expected
2007-01-16 12:27:02 UTC (rev 71126)
@@ -6,3 +6,4 @@
Group name: ff1
#0 Microsoft3: http://www.microsoft.com port 0
#1 Microsoft5: http://www.microsoft.com port 0
+Group name: ff2
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches