2006-11-07 Atsushi Enomoto <atsushi@ximian.com>

	* ServiceDescriptionSerializerBase2.cs :
	  sync with sys.xml.serialization API updates.

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

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
index 12aff693578c742cef2f9ffc0f3e37143efc2591..35ec8db8e4dfc5aa64b6f0abd8bcf712d129c20a 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-07  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ServiceDescriptionSerializerBase2.cs :
+         sync with sys.xml.serialization API updates.
+
 2006-10-25  Ankit Jain  <jankit@novell.com>
 
        * ServiceDescriptionSerializerBase2.cs: Mark classes as internal.

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionSerializerBase2.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionSerializerBase2.cs
index 725454e6ca40f5e4c5f1d18053994d618ac95d8a..2a6e35e67906234bf7ddeaeffe20aecb6a5e3aa4 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionSerializerBase2.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionSerializerBase2.cs
@@ -2474,7 +2474,7 @@ namespace System.Web.Services.Description
                }
        }
 #if !TARGET_JVM
-       internal class XmlSerializerContract : System.Xml.Serialization.IXmlSerializerImplementation
+       internal class XmlSerializerContract : System.Xml.Serialization.XmlSerializerImplementation
        {
                System.Collections.Hashtable readMethods = null;
                System.Collections.Hashtable writeMethods = null;
@@ -2494,7 +2494,7 @@ namespace System.Web.Services.Description
 
                public System.Collections.Hashtable ReadMethods {
                        get {
-                               lock (System.Xml.Serialization.XmlSerializationGeneratedCode.InternalSyncObject) {
+                               lock (this) {
                                        if (readMethods == null) {
                                                readMethods = new System.Collections.Hashtable ();
                                                readMethods.Add (@"", @"ReadRoot_ServiceDescription");
@@ -2506,7 +2506,7 @@ namespace System.Web.Services.Description
 
                public System.Collections.Hashtable WriteMethods {
                        get {
-                               lock (System.Xml.Serialization.XmlSerializationGeneratedCode.InternalSyncObject) {
+                               lock (this) {
                                        if (writeMethods == null) {
                                                writeMethods = new System.Collections.Hashtable ();
                                                writeMethods.Add (@"", @"WriteRoot_ServiceDescription");
@@ -2518,7 +2518,7 @@ namespace System.Web.Services.Description
 
                public System.Collections.Hashtable TypedSerializers {
                        get {
-                               lock (System.Xml.Serialization.XmlSerializationGeneratedCode.InternalSyncObject) {
+                               lock (this) {
                                        if (typedSerializers == null) {
                                                typedSerializers = new System.Collections.Hashtable ();
                                                typedSerializers.Add (@"", new definitionsSerializer());