Browse Source

moving static fields to AppDomain in Java builds

svn path=/trunk/mcs/; revision=45431
Konstantin Triger 20 years ago
parent
commit
c84831d044

+ 4 - 0
mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog

@@ -1,3 +1,7 @@
+2005-06-05 Konstantin Triger <[email protected]>
+
+	* WebServicesConfigurationSectionHandler.cs: moving static fields to AppDomain in Java builds
+
 2004-06-01  Gert Driesen <[email protected]>
 
 	* WebServicesConfigurationSectionHandler.cs: removed unused variables

+ 12 - 0
mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs

@@ -47,7 +47,19 @@ namespace System.Web.Services.Configuration
 	
 	class WSConfig
 	{
+#if !TARGET_JVM
 		volatile static WSConfig instance;
+#else
+		static WSConfig instance {
+			get {
+				return (WSConfig)AppDomain.CurrentDomain.GetData("WSConfig.instance");
+			}
+			set {
+				AppDomain.CurrentDomain.SetData("WSConfig.instance", value);
+			}
+		}
+
+#endif
 		WSProtocol protocols;
 		string wsdlHelpPage;
 		string filePath;

+ 4 - 0
mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog

@@ -1,3 +1,7 @@
+2005-06-05 Konstantin Triger <[email protected]>
+
+	* ServiceDescription.cs, SoapTransportImporter.cs: moving static fields to AppDomain in Java builds
+
 2005-04-11  Lluis Sanchez Gual <[email protected]>
 
 	* ServiceDescriptionCollection.cs: Notify the parent importer

+ 11 - 0
mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs

@@ -66,7 +66,18 @@ namespace System.Web.Services.Description
 		ServiceCollection services;
 		string targetNamespace;
 		Types types;
+#if !TARGET_JVM
 		static ServiceDescriptionSerializer serializer;
+#else
+		static ServiceDescriptionSerializer serializer {
+			get {
+				return (ServiceDescriptionSerializer)AppDomain.CurrentDomain.GetData("ServiceDescriptionSerializer.serializer");
+			}
+			set {
+				AppDomain.CurrentDomain.SetData("ServiceDescriptionSerializer.serializer", value);
+			}
+		}
+#endif
 
 		#endregion // Fields
 

+ 11 - 1
mcs/class/System.Web.Services/System.Web.Services.Description/SoapTransportImporter.cs

@@ -35,8 +35,18 @@ namespace System.Web.Services.Description {
 	public abstract class SoapTransportImporter {
 
 		#region Fields
-
+#if !TARGET_JVM
 		static ArrayList transportImporters;
+#else
+		static ArrayList transportImporters {
+			get {
+				return (ArrayList)AppDomain.CurrentDomain.GetData("SoapTransportImporter.transportImporters");
+			}
+			set {
+				AppDomain.CurrentDomain.SetData("SoapTransportImporter.transportImporters", value);
+			}
+		}
+#endif
 		SoapProtocolImporter importContext;
 
 		#endregion // Fields

+ 4 - 0
mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog

@@ -1,3 +1,7 @@
+2005-06-05 Konstantin Triger <[email protected]>
+
+	* WebClientProtocol.cs, TypeStubManager.cs, SoapExtension.cs: moving static fields to AppDomain in Java builds
+
 2005-02-07  Lluis Sanchez Gual <[email protected]>
 
 	* XmlReturnWriter.cs, SoapDocumentationHandler.cs: Use utf-8 encoding

+ 11 - 0
mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs

@@ -62,7 +62,18 @@ namespace System.Web.Services.Protocols {
 		public abstract void ProcessMessage (SoapMessage message);
 
 
+#if !TARGET_JVM
 		static ArrayList[] globalExtensions;
+#else
+		static ArrayList[] globalExtensions {
+			get {
+				return (ArrayList[])AppDomain.CurrentDomain.GetData("SoapExtension.globalExtensions");
+			}
+			set {
+				AppDomain.CurrentDomain.SetData("SoapExtension.globalExtensions", value);
+			}
+		}
+#endif
 
 		internal static SoapExtension[] CreateExtensionChain (SoapExtensionRuntimeConfig[] extensionConfigs)
 		{

+ 11 - 0
mcs/class/System.Web.Services/System.Web.Services.Protocols/TypeStubManager.cs

@@ -369,7 +369,18 @@ namespace System.Web.Services.Protocols {
 	//
 	internal class TypeStubManager 
 	{
+#if !TARGET_JVM
 		static Hashtable type_to_manager;
+#else
+		static Hashtable type_to_manager {
+			get {
+				return (Hashtable)AppDomain.CurrentDomain.GetData("TypeStubManager.type_to_manager");
+			}
+			set {
+				AppDomain.CurrentDomain.SetData("TypeStubManager.type_to_manager", value);
+			}
+		}
+#endif
 		
 		static TypeStubManager ()
 		{

+ 11 - 0
mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientProtocol.cs

@@ -58,7 +58,18 @@ namespace System.Web.Services.Protocols {
 		//
 		WebRequest current_request;
 		
+#if !TARGET_JVM
 		static HybridDictionary cache;
+#else
+		static HybridDictionary cache {
+			get {
+				return (HybridDictionary)AppDomain.CurrentDomain.GetData("WebClientProtocol.cache");
+			}
+			set {
+				AppDomain.CurrentDomain.SetData("WebClientProtocol.cache", value);
+			}
+		}
+#endif
 		#endregion
 
 		#region Constructors