2008-04-30 Marek Habersack <mhabersack@novell.com>

	* ConfigurationElement.cs: HasLocalModifications considers a
	property modifed locally if its origin is SetHere and it's been
	marked as modified.

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

diff --git a/mcs/class/System.Configuration/System.Configuration/ChangeLog b/mcs/class/System.Configuration/System.Configuration/ChangeLog
index f19c3103d6ad234d9aa7f8da3ad01c7fb21debf8..d6ea09c97d7793620ab36844eb929fc5a26e2204 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-30  Marek Habersack  <mhabersack@novell.com>
+
+       * ConfigurationElement.cs: HasLocalModifications considers a
+       property modifed locally if its origin is SetHere and it's been
+       marked as modified.
+
 2008-03-20  Igor Zelmanovich  <igorz@mainsoft.com>
 
        * Configuration.cs:

diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
index 56fb151d9f0a0be4ea959b9481f1bb2bacabd140..6dfabd15da4a58eec4d5a9db6fa2e38c874c3239 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
@@ -286,7 +286,7 @@ namespace System.Configuration
                internal virtual bool HasLocalModifications ()
                {
                        foreach (PropertyInformation pi in ElementInformation.Properties)
-                               if (pi.ValueOrigin == PropertyValueOrigin.SetHere)
+                               if (pi.ValueOrigin == PropertyValueOrigin.SetHere && pi.IsModified)
                                        return true;
                        
                        return false;