SoapTypeAttribute.cs: Set correct value for default namespace.

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Metadata/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Metadata/ChangeLog
index f663b51ebebaf3edf957de597c5bcc0530f3499e..630874d37b11d6c723bc342c592f056c4387d16e 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Metadata/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting.Metadata/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-03  Lluis Sanchez Gual  <lluis@ximian.com>
+
+       * SoapTypeAttribute.cs: Set correct value for default namespace.
+
 2003-11-26  Lluis Sanchez Gual  <lluis@ximian.com>
 
        * SoapAttribute.cs, SoapFieldAttribute.cs, SoapMethodAttribute.cs,

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapTypeAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapTypeAttribute.cs
index 8785c92b4a569a9b33c9ab0173c90996d3ec8188..6c7b4e9cdbf8e623646579eb8fcd189302162eec 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapTypeAttribute.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapTypeAttribute.cs
@@ -126,7 +126,12 @@ namespace System.Runtime.Remoting.Metadata {
                                _xmlTypeName = type.Name;
                        
                        if (_xmlTypeNamespace == null)
-                               _xmlTypeNamespace = SoapServices.CodeXmlNamespaceForClrTypeNamespace (type.Namespace, type.Assembly.GetName().Name);
+                       {
+                               string na;
+                               if (type.Assembly == typeof (object).Assembly) na = string.Empty;
+                               else na = type.Assembly.GetName().Name;
+                               _xmlTypeNamespace = SoapServices.CodeXmlNamespaceForClrTypeNamespace (type.Namespace, na);
+                       }
                        
                        if (_xmlNamespace == null)
                                _xmlNamespace = _xmlTypeNamespace;