Author: kostat
Date: 2007-01-16 07:26:17 -0500 (Tue, 16 Jan 2007)
New Revision: 71125

Added:
   
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
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/Makefile
Log:
merge -r 71112:71113

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:21:52 UTC (rev 71124)
+++ 
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/System.Configuration/ChangeLog
        2007-01-16 12:26:17 UTC (rev 71125)
@@ -1,3 +1,8 @@
+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.
+
 2006-12-27  Vladimir Krasnov  <[EMAIL PROTECTED]>
 
        * ConfigurationElementCollection.cs: fixed BaseAdd, looking for

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:21:52 UTC (rev 71124)
+++ 
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
  2007-01-16 12:26:17 UTC (rev 71125)
@@ -334,13 +334,12 @@
                                        
                                        PropertyInformation prop = 
ElementInformation.Properties [reader.LocalName];
                                        if (prop == null || 
(serializeCollectionKey && !prop.IsKey)) {
-                                               if (prop == null) {
-                                                       
ConfigurationElementCollection c = GetDefaultCollection ();
-                                                       if (c != null && 
c.OnDeserializeUnrecognizedElement (reader.LocalName, reader))
-                                                               continue;
-                                               }
-
                                                if 
(!OnDeserializeUnrecognizedElement (reader.LocalName, reader)) {
+                                                       if (prop == null) {
+                                                               
ConfigurationElementCollection c = GetDefaultCollection ();
+                                                               if (c != null 
&& c.OnDeserializeUnrecognizedElement (reader.LocalName, reader))
+                                                                       
continue;
+                                                       }
                                                        throw new 
ConfigurationException ("Unrecognized element '" + reader.LocalName + "'.");
                                                }
                                                continue;

Modified: 
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/Makefile
===================================================================
--- 
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/Makefile
      2007-01-16 12:21:52 UTC (rev 71124)
+++ 
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/Makefile
      2007-01-16 12:26:17 UTC (rev 71125)
@@ -1,4 +1,4 @@
-TESTS = t1.exe t2.exe t3.exe t4.exe t5.exe t6.exe t7.exe t8.exe t9.exe t10.exe 
t11.exe t12.exe t15.exe t16.exe t17.exe t18.exe t19.exe t20.exe t21.exe t22.exe 
t23.exe t24.exe t25.exe t26.exe t27.exe t28.exe t29.exe t30.exe t31.exe t32.exe 
t33.exe t34.exe t35.exe t36.exe t37.exe t38.exe t39.exe t40.exe t41.exe
+TESTS = t1.exe t2.exe t3.exe t4.exe t5.exe t6.exe t7.exe t8.exe t9.exe t10.exe 
t11.exe t12.exe t15.exe t16.exe t17.exe t18.exe t19.exe t20.exe t21.exe t22.exe 
t23.exe t24.exe t25.exe t26.exe t27.exe t28.exe t29.exe t30.exe t31.exe t32.exe 
t33.exe t34.exe t35.exe t36.exe t37.exe t38.exe t39.exe t40.exe t41.exe t42.exe
 # t13.exe t14.exe
 
 check: local compare

Copied: 
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.cs
 (from rev 71113, trunk/mcs/class/System.Configuration/Test/standalone/t42.cs)

Copied: 
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.exe.config
 (from rev 71113, 
trunk/mcs/class/System.Configuration/Test/standalone/t42.exe.config)

Copied: 
branches/mainsoft/gh20preview2/mcs/class/System.Configuration/Test/standalone/t42.exe.expected
 (from rev 71113, 
trunk/mcs/class/System.Configuration/Test/standalone/t42.exe.expected)

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

Reply via email to