Author: lluis
Date: 2005-05-12 09:54:29 -0400 (Thu, 12 May 2005)
New Revision: 44439
Modified:
trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
trunk/mcs/class/System.XML/System.Xml.Serialization/SoapReflectionImporter.cs
Log:
2005-05-12 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* SoapReflectionImporter.cs: In ImportTypeMap, make sure that all
types indirectly imported by this method use the same namespace.
Modified: trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
2005-05-12 13:45:37 UTC (rev 44438)
+++ trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
2005-05-12 13:54:29 UTC (rev 44439)
@@ -1,3 +1,8 @@
+2005-05-12 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * SoapReflectionImporter.cs: In ImportTypeMap, make sure that all
+ types indirectly imported by this method use the same namespace.
+
2005-05-09 Atsushi Enomoto <[EMAIL PROTECTED]>
* TypeTableEntry.cs : removed obsolete code.
Modified:
trunk/mcs/class/System.XML/System.Xml.Serialization/SoapReflectionImporter.cs
===================================================================
---
trunk/mcs/class/System.XML/System.Xml.Serialization/SoapReflectionImporter.cs
2005-05-12 13:45:37 UTC (rev 44438)
+++
trunk/mcs/class/System.XML/System.Xml.Serialization/SoapReflectionImporter.cs
2005-05-12 13:54:29 UTC (rev 44439)
@@ -109,8 +109,10 @@
if (type == typeof (void))
throw new InvalidOperationException ("Type " +
type.Name + " may not be serialized.");
+ string oldNs = initialDefaultNamespace;
if (defaultNamespace == null) defaultNamespace =
initialDefaultNamespace;
if (defaultNamespace == null) defaultNamespace =
string.Empty;
+ initialDefaultNamespace = defaultNamespace;
XmlTypeMapping map;
switch (TypeTranslator.GetTypeData(type).SchemaType)
@@ -127,6 +129,8 @@
map.Format = SerializationFormat.Encoded;
Type[] extraTypes = includedTypes != null ?
(Type[])includedTypes.ToArray(typeof(Type)) : null;
map.Source = new SoapTypeSerializationSource (type,
attributeOverrides, defaultNamespace, extraTypes);
+
+ initialDefaultNamespace = oldNs;
return map;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
