Sfoglia il codice sorgente

* XmlDocument.cs (GetIdenticalAttribute): Temporarily remove test
for OwnerElement.IsRooted to fix the build..

* SoapServices.cs (XmlNsForClrTypeWithNsAndAssembly):
Fixed typo. It's 'Ns', but 'Ms'.

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

Duncan Mak 22 anni fa
parent
commit
206ee6ebab

+ 5 - 0
mcs/class/System.XML/System.Xml/ChangeLog

@@ -1,3 +1,8 @@
+2003-07-26  Duncan Mak  <[email protected]>
+
+	* XmlDocument.cs (GetIdenticalAttribute): Temporarily remove test
+	for OwnerElement.IsRooted to fix the build..
+
 2003-07-26  Atsushi Enomoto <[email protected]>
 
 	* XmlDocumentType.cs :

+ 2 - 1
mcs/class/System.XML/System.Xml/XmlDocument.cs

@@ -462,7 +462,8 @@ namespace System.Xml
 			XmlAttribute attr = this.idTable [id] as XmlAttribute;
 			if (attr == null)
 				return null;
-			if (attr.OwnerElement == null || !attr.OwnerElement.IsRooted) {
+//			if (attr.OwnerElement == null || !attr.OwnerElement.IsRooted) {
+                        if (attr.OwnerElement == null) {
 				idTable.Remove (id);
 				return null;
 			}

+ 5 - 0
mcs/class/corlib/System.Runtime.Remoting/ChangeLog

@@ -1,3 +1,8 @@
+2003-07-26  Duncan Mak  <[email protected]>
+
+	* SoapServices.cs (XmlNsForClrTypeWithNsAndAssembly):
+	Fixed typo. It's 'Ns', but 'Ms'.
+
 2003-07-25  Lluis Sanchez Gual <[email protected]>
 
 	* RemotingServices.cs: If the type for a proxy is not available in

+ 4 - 4
mcs/class/corlib/System.Runtime.Remoting/SoapServices.cs

@@ -36,7 +36,7 @@ namespace System.Runtime.Remoting {
 			get { return "http://schemas.microsoft.com/clr/ns/"; }
 		}
 
-		public static string XmlNsForClrTypeWithMsAndAssembly 
+		public static string XmlNsForClrTypeWithNsAndAssembly
 		{
 			get { return "http://schemas.microsoft.com/clr/nsassem/"; }
 		}
@@ -52,7 +52,7 @@ namespace System.Runtime.Remoting {
 			if (assemblyName == string.Empty)
 				return XmlNsForClrTypeWithNs + typeNamespace + "/" + assemblyName;
 			else
-				return XmlNsForClrTypeWithMsAndAssembly + typeNamespace + "/" + assemblyName;
+				return XmlNsForClrTypeWithNsAndAssembly + typeNamespace + "/" + assemblyName;
 		}
 
 		public static bool DecodeXmlNamespaceForClrTypeNamespace (string inNamespace, 
@@ -64,9 +64,9 @@ namespace System.Runtime.Remoting {
 			typeNamespace = null;
 			assemblyName = null;
 
-			if (inNamespace.StartsWith(XmlNsForClrTypeWithMsAndAssembly))
+			if (inNamespace.StartsWith(XmlNsForClrTypeWithNsAndAssembly))
 			{
-				int typePos = XmlNsForClrTypeWithMsAndAssembly.Length;
+				int typePos = XmlNsForClrTypeWithNsAndAssembly.Length;
 				if (typePos >= inNamespace.Length) return false;
 				int assemPos = inNamespace.IndexOf ('/', typePos+1);
 				if (assemPos == -1) return false;