Add Mainsoft's files System.Runtime.Serialization.Formatters.Soap.vmwcsproj and Syste...

[mono.git] / mcs / class / System.Runtime.Serialization.Formatters.Soap / System.Runtime.Serialization.Formatters.Soap / SoapTypeMapper.cs

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
index a30f0caccfa4c54490843f29df1151596ad5a4fa..15cc36bdc720028c72cea78d009fe2b1747cf0eb 100644 (file)
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
@@ -263,11 +263,19 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                                        namespaceToPrefixTable[namespaceURI] = prefix;
 
                                }
+
                                int i = typeName.IndexOf ("[");
                                if (i != -1)
                                        typeName = XmlConvert.EncodeName (typeName.Substring (0, i)) + typeName.Substring (i);
                                else
-                                       typeName = XmlConvert.EncodeName (typeName);
+                               {
+                                       int j = typeName.IndexOf ("&");
+                                       if (j != -1)
+                                               typeName = XmlConvert.EncodeName (typeName.Substring (0, j)) + typeName.Substring (j);
+                                       else
+                                               typeName = XmlConvert.EncodeName (typeName);
+                               }
+
                                element = new Element(
                                        prefix, 
                                        typeName, 
@@ -493,7 +501,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                        reader.XmlReader.MoveToElement ();
                        if (reader.XmlReader.IsEmptyElement) {
                                reader.XmlReader.Skip ();
-                               return null;
+                               return new Type[0];
                        }
                        reader.XmlReader.ReadStartElement ();
                        string names = reader.XmlReader.ReadString ();