Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mcs/class/System/System.ComponentModel.Design.Serialization')
-rwxr-xr-x[-rw-r--r--]mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog6
-rwxr-xr-x[-rw-r--r--]mcs/class/System/System.ComponentModel.Design.Serialization/ContextStack.cs2
2 files changed, 7 insertions, 1 deletions
diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog b/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog
index 7ab4293243d..3f705c8cadc 100644..100755
--- a/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog
+++ b/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-05 Ivan N. Zlatev <contact@i-nz.net>
+
+ * ContextStack.cs: Also check for subclasses in the Type-based
+ indexter property.
+ [Fixes bug #509151]
+
2007-11-13 Atsushi Enomoto <atsushi@ximian.com>
* ResolveNameEventHandler.cs, RootDesignerSerializerAttribute.cs,
diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/ContextStack.cs b/mcs/class/System/System.ComponentModel.Design.Serialization/ContextStack.cs
index e7b0dd96066..132e28447c8 100644..100755
--- a/mcs/class/System/System.ComponentModel.Design.Serialization/ContextStack.cs
+++ b/mcs/class/System/System.ComponentModel.Design.Serialization/ContextStack.cs
@@ -57,7 +57,7 @@ namespace System.ComponentModel.Design.Serialization
public object this[Type type] {
get {
for (int i = _contextList.Count - 1; i >= 0; i--)
- if (_contextList[i].GetType () == type)
+ if (type.IsInstanceOfType (_contextList[i]))
return _contextList[i];
return null;
}