Author: lluis
Date: 2005-04-05 06:20:09 -0400 (Tue, 05 Apr 2005)
New Revision: 42555

Modified:
   
trunk/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog
   
trunk/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
Log:
2005-05-05  Lluis Sanchez Gual <[EMAIL PROTECTED]>

        * SoapTypeMapper.cs: Added missing maps for primitive types and
        fixed bool conversion to string. This patch by Luke Ravitch
        fixes bug #74295.



Modified: 
trunk/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog
===================================================================
--- 
trunk/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog
 2005-04-05 09:29:43 UTC (rev 42554)
+++ 
trunk/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog
 2005-04-05 10:20:09 UTC (rev 42555)
@@ -1,3 +1,9 @@
+2005-05-05  Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+       * SoapTypeMapper.cs: Added missing maps for primitive types and
+       fixed bool conversion to string. This patch by Luke Ravitch
+       fixes bug #74295.
+
 2005-02-10  Lluis Sanchez Gual <[EMAIL PROTECTED]>
 
        * SoapFormatter.cs: Don't store the SoapWriter in an instance field,

Modified: 
trunk/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
===================================================================
--- 
trunk/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
 2005-04-05 09:29:43 UTC (rev 42554)
+++ 
trunk/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
 2005-04-05 10:20:09 UTC (rev 42555)
@@ -313,21 +313,51 @@
                        element = new Element("string", SoapEncodingNamespace);
                        xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
 
+                       element = new Element("boolean", XmlSchema.Namespace);
+                       elementType = typeof(bool);
+                       xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
+                       
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
+
+                       element = new Element("byte", XmlSchema.Namespace);
+                       elementType = typeof(sbyte);
+                       xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
+                       
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
+
+                       element = new Element("unsignedByte", 
XmlSchema.Namespace);
+                       elementType = typeof(byte);
+                       xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
+                       
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
+
                        element = new Element("long", XmlSchema.Namespace);
                        elementType = typeof(long);
                        xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
                        
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
 
+                       element = new Element("unsignedLong", 
XmlSchema.Namespace);
+                       elementType = typeof(ulong);
+                       xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
+                       
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
+
                        element = new Element("int", XmlSchema.Namespace);
                        elementType = typeof(int);
                        xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
                        
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
 
+                       element = new Element("unsignedInt", 
XmlSchema.Namespace);
+                       elementType = typeof(uint);
+                       xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
+                       
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
+
                        element = new Element("float", XmlSchema.Namespace);
                        elementType = typeof(float);
                        xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
                        
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
 
+                       element = new Element("double", XmlSchema.Namespace);
+                       elementType = typeof(double);
+                       xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
+                       
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
+
                        element = new Element("decimal", XmlSchema.Namespace);
                        elementType = typeof(decimal);
                        xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
@@ -338,6 +368,11 @@
                        xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
                        
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
 
+                       element = new Element("unsignedShort", 
XmlSchema.Namespace);
+                       elementType = typeof(ushort);
+                       xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
+                       
typeToXmlNodeTable.Add(elementType.AssemblyQualifiedName, element);
+
                        element = new Element("anyType", XmlSchema.Namespace);
                        elementType = typeof(object);
                        xmlNodeToTypeTable.Add(element, 
elementType.AssemblyQualifiedName);
@@ -381,6 +416,9 @@
                        else if (value is TimeSpan) {
                                return SoapDuration.ToString ((TimeSpan)value);
                        }
+                       else if (value is bool) {
+                               return ((bool) value) ? "true" : "false";
+                       }
                        else {
                                return value.ToString ();
                        }

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

Reply via email to