Author: lluis
Date: 2006-03-21 06:31:17 -0500 (Tue, 21 Mar 2006)
New Revision: 58215

Modified:
   branches/mono-1-1-13/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
   
branches/mono-1-1-13/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapMemberElement.cs
Log:
2006-03-21  Lluis Sanchez Gual  <[EMAIL PROTECTED]>

        * System.Xml.Serialization/XmlTypeMapMemberElement.cs: When
        looking for the correct element definition for a member,
        based on the value type, take into account subypes of the
        declared types. Fixes bug #77447.



Modified: 
branches/mono-1-1-13/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
===================================================================
--- 
branches/mono-1-1-13/mcs/class/System.XML/System.Xml.Serialization/ChangeLog    
    2006-03-21 05:49:11 UTC (rev 58214)
+++ 
branches/mono-1-1-13/mcs/class/System.XML/System.Xml.Serialization/ChangeLog    
    2006-03-21 11:31:17 UTC (rev 58215)
@@ -1,3 +1,10 @@
+2006-03-21  Lluis Sanchez Gual  <[EMAIL PROTECTED]>
+
+       * System.Xml.Serialization/XmlTypeMapMemberElement.cs: When
+       looking for the correct element definition for a member,
+       based on the value type, take into account subypes of the
+       declared types. Fixes bug #77447.
+
 2006-03-07  Lluis Sanchez Gual  <[EMAIL PROTECTED]>
 
        * XmlReflectionImporter.cs: Ignore the element namespace if

Modified: 
branches/mono-1-1-13/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapMemberElement.cs
===================================================================
--- 
branches/mono-1-1-13/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapMemberElement.cs
       2006-03-21 05:49:11 UTC (rev 58214)
+++ 
branches/mono-1-1-13/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapMemberElement.cs
       2006-03-21 11:31:17 UTC (rev 58215)
@@ -84,9 +84,8 @@
                        {
                                if (memberValue == null)
                                        return (XmlTypeMapElementInfo) 
_elementInfo[0];
-                               Type type = memberValue.GetType();
                                foreach (XmlTypeMapElementInfo elem in 
_elementInfo)
-                                       if (elem.TypeData.Type == type) return 
elem;
+                                       if (elem.TypeData.Type.IsInstanceOfType 
(memberValue)) return elem;
                        }
                        return null;
                }

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

Reply via email to