fix typo: set IsNullable flag for primitiveNullableTypes

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

diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
index d5e9e4b5c1655aa6e8a0b00d542662dca555161a..e7f9c27839dd68b4bfc0a04f82d2a0e08ee973ed 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-24  Konstantin Triger <kostat@mainsoft.com>
+
+       * TypeTranslator.cs: fix typo: set IsNullable flag for primitiveNullableTypes.
+
 2007-05-14  Adar Wesley <adarw@mainsoft.com>
 
        * XmlSchemaExporter.cs: added missing overload for method ExportAnyType.

diff --git a/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs b/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs
index 447c4fb75b44189a652da7de48c7178111ddcf38..5e9dbc46bec2d44ad779e556fabaa294f1848d48 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs
@@ -136,7 +136,7 @@ namespace System.Xml.Serialization
                        primitiveTypes.Add ("base64", new TypeData (typeof (byte[]), "base64", true));
 
 #if NET_2_0
-                       primitiveNullableTypes = new Hashtable ();
+                       primitiveNullableTypes = Hashtable.Synchronized(new Hashtable ());
                        foreach (DictionaryEntry de in primitiveTypes) {
                                TypeData td = (TypeData) de.Value;
                                TypeData ntd = new TypeData (td.Type, td.XmlType, true);
@@ -163,14 +163,13 @@ namespace System.Xml.Serialization
 
                                TypeData pt = GetTypeData (type); // beware this recursive call btw ...
                                if (pt != null) {
-                                       lock (primitiveNullableTypes) {
                                                TypeData tt = (TypeData) primitiveNullableTypes [pt.XmlType];
                                                if (tt == null) {
                                                        tt = new TypeData (type, pt.XmlType, true);
+                                                       tt.IsNullable = true;
                                                        primitiveNullableTypes [pt.XmlType] = tt;
                                                }
                                                return tt;
-                                       }
                                }
                        }
 #endif