2009-07-17 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* ConfigurationElement.cs: don't skip xml nodes when reading 2
	ConfigurationElement in a row. Patch by Greg Smolyn that fixes bug
	#521231.

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

diff --git a/mcs/class/System.Configuration/System.Configuration/ChangeLog b/mcs/class/System.Configuration/System.Configuration/ChangeLog
index 5041f71ea0e663ea15612d1a816728092cbd0aab..70fd64932c0e76da6711fcb7375986f18eb41616 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-17 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * ConfigurationElement.cs: don't skip xml nodes when reading 2
+       ConfigurationElement in a row. Patch by Greg Smolyn that fixes bug
+       #521231.
+
 2009-07-15  Marek Habersack  <mhabersack@novell.com>
 
        * Configuration.cs: explicitly flush the stream when writing XML

diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
index cf363780784a8c2d4eb5c60da9eab9757a868473..fcf0f062795be2b2548a2e55bb97079294f0812f 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
@@ -384,12 +384,10 @@ namespace System.Configuration
                                        val.DeserializeElement (reader, serializeCollectionKey);
                                        readProps [prop] = prop.Name;
 
-                                       reader.Read();
+                                       if(depth == reader.Depth)
+                                               reader.Read();
 
-                               } while (depth < reader.Depth);
-
-                               if (reader.NodeType == XmlNodeType.EndElement)
-                                       reader.Read ();
+                               } while (depth < reader.Depth);                         
                        }
                        
                        modified = false;

diff --git a/mcs/class/System.Configuration/System.Configuration_test.dll.sources b/mcs/class/System.Configuration/System.Configuration_test.dll.sources
index 29a9eb1f64f9eb12cc01239cc17f2729cf01cb2d..c85856013ebc06d291d2a6b78e46619423a86fba 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration_test.dll.sources
+++ b/mcs/class/System.Configuration/System.Configuration_test.dll.sources
@@ -8,6 +8,7 @@ System.Configuration/ConfigurationPermissionTest.cs
 System.Configuration/ConfigurationPropertyTest.cs
 System.Configuration/ConfigurationManagerTest.cs
 System.Configuration/ConfigurationSectionGroupTest.cs
+System.Configuration/ConfigurationSectionTest.cs
 System.Configuration/ConnectionStringSettingsTest.cs
 System.Configuration/DefaultValidatorTest.cs
 System.Configuration/ExeConfigurationFileMapTest.cs

diff --git a/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog b/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog
index 5954c62caf1d6eae9881b38d425605d5d471b850..02808d6ff9743beaac284eec1cf16a048ee97090 100644 (file)
--- a/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-17 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * ConfigurationSectionTest.cs: New test.
+
 2008-09-14  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * ConfigurationManagerTest.cs: Added test for bug #323622.

diff --git a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationSectionTest.cs b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationSectionTest.cs
new file mode 100644 (file)
index 0000000..fbd3f1b
--- /dev/null
+++ b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationSectionTest.cs
@@ -0,0 +1,123 @@
+//
+// System.Configuration.ConfigurationSectionTest.cs - Unit tests
+//
+// Author:
+//     Greg Smolyn
+//     Gonzalo Paniagua Javier <gonzalo@novell.com
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+using System;
+using System.Configuration;
+using System.IO;
+using System.Xml;
+using NUnit.Framework;
+
+namespace MonoTests.System.Configuration {
+       [TestFixture]
+       public class ConfigurationElementCollectionTest
+       {
+               [Test]
+               public void TwoConfigElementsInARow () // Bug #521231
+               {
+                       string config = @"<fooconfig><foos><foo id=""1"" /></foos><bars><bar id=""1"" /></bars></fooconfig>";
+                       var fooSection = new FooConfigSection ();
+                       fooSection.Load (config);
+               }
+
+               class FooConfigSection : ConfigurationSection
+               {
+                       public void Load (string xml) 
+                       { 
+                               Init (); 
+                               using (StringReader sr = new StringReader(xml))  
+                                       using (XmlReader reader = new XmlTextReader(sr)) { 
+                                               DeserializeSection (reader); 
+                                       } 
+                       }
+
+                       [ConfigurationProperty("foos")]
+                       [ConfigurationCollection(typeof(FooConfigElementCollection), AddItemName="foo")]
+                       public FooConfigElementCollection Foos {
+                               get { return (FooConfigElementCollection)base["foos"]; }
+                               set { base["foos"] = value; }
+                       }
+
+                       [ConfigurationProperty("bars")]
+                       [ConfigurationCollection(typeof(BarConfigElementCollection), AddItemName="bar")]
+                       public BarConfigElementCollection Bars {
+                               get { return (BarConfigElementCollection)base["bars"]; }
+                               set { base["bars"] = value; }
+                       }                       
+               }
+
+               class FooConfigElementCollection : ConfigurationElementCollection
+               {
+                       protected override ConfigurationElement CreateNewElement ()
+                       {
+                               return new FooConfigElement();
+                       }
+
+                       protected override object GetElementKey (ConfigurationElement element)
+                       {
+                               return ((FooConfigElement)element).Id;
+                       }
+               }
+
+               class FooConfigElement : ConfigurationElement
+               {
+                       [ConfigurationProperty("id")]
+                       public int Id {
+                               get { return (int)base["id"]; }
+                               set { base["id"] = value; }
+                       }
+
+               }
+
+               class BarConfigElementCollection : ConfigurationElementCollection
+               {
+                       protected override ConfigurationElement CreateNewElement ()
+                       {
+                               return new BarConfigElement();
+                       }
+
+                       protected override object GetElementKey (ConfigurationElement element)
+                       {
+                               return ((BarConfigElement)element).Id;
+                       }
+               }
+
+               class BarConfigElement : ConfigurationElement
+               {
+                       [ConfigurationProperty("id")]
+                       public int Id {
+                               get { return (int)base["id"]; }
+                               set { base["id"] = value; }
+                       }               
+               }       
+       }
+}
+
+#endif