2005-06-21 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mcs / class / System.XML / System.Xml.Schema / XmlSchema.cs

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
index e123f6ebfe0625a86e9b54f48e62d14c9eedf7d3..636695f56f74a55389b2166c262c6a7bc12ad40a 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
@@ -578,7 +578,8 @@ namespace System.Xml.Schema
                        Uri baseUri = null;
                        if (this.SourceUri != null && this.SourceUri != String.Empty)
                                baseUri = new Uri (this.SourceUri);
-                       return resolver.ResolveUri (baseUri, relativeUri).ToString ();
+                       Uri abs = resolver.ResolveUri (baseUri, relativeUri);
+                       return abs != null ? abs.ToString () : String.Empty;
                }
 
                internal bool IsNamespaceAbsent (string ns)
@@ -870,8 +871,6 @@ namespace System.Xml.Schema
                        XmlSerializerNamespaces nss = new XmlSerializerNamespaces ();
 
                        if (namespaceManager != null) {
-                               if (nss == null)
-                                       nss = new XmlSerializerNamespaces ();
                                foreach (string name in namespaceManager) {
                                        //xml and xmlns namespaces are added by default in namespaceManager.
                                        //So we should ignore them
@@ -881,10 +880,21 @@ namespace System.Xml.Schema
                        }
 
                        if (Namespaces != null && Namespaces.Count > 0) {
-                               nss.Add (String.Empty, XmlSchema.Namespace);
-                               foreach (XmlQualifiedName qn in Namespaces.ToArray ()) {
+                               XmlQualifiedName [] qnames = Namespaces.ToArray ();
+                               foreach (XmlQualifiedName qn in qnames)
                                        nss.Add (qn.Name, qn.Namespace);
+                               string p = String.Empty;
+                               bool loop = true;
+                               for (int idx = 1; loop; idx++) {
+                                       loop = false;
+                                       foreach (XmlQualifiedName qn in qnames)
+                                               if (qn.Name == p) {
+                                                       p = "q" + idx;
+                                                       loop = true;
+                                                       break;
+                                               }
                                }
+                               nss.Add (p, XmlSchema.Namespace);
                        }
 
                        if (nss.Count == 0) {
@@ -896,7 +906,13 @@ namespace System.Xml.Schema
                        }
 
                        XmlSchemaSerializer xser = new XmlSchemaSerializer ();
-                       xser.Serialize (writer, this, nss);
+                       XmlSerializerNamespaces backup = Namespaces;
+                       try {
+                               Namespaces = null;
+                               xser.Serialize (writer, this, nss);
+                       } finally {
+                               Namespaces = backup;
+                       }
                        writer.Flush();
                }
                #endregion