* HttpSoapWebServiceHandler.cs, WebServiceHandler.cs: Do not assign the

	  context to the service. It already gets it from HttpContext.Current.

svn path=/branches/mono-1-0/mcs/; revision=32818

3 files changed, 6 insertions, 12 deletions

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
index 3b3ed1be736..8b0776c0c38 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-25  Lluis Sanchez Gual <lluis@novell.com>
+
+	* HttpSoapWebServiceHandler.cs, WebServiceHandler.cs: Do not assign the
+	  context to the service. It already gets it from HttpContext.Current.
+
 2004-07-20  Lluis Sanchez Gual  <lluis@ximian.com>
 
 	* HttpWebClientProtocol.cs: Add received cookies to cookieContainer when
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSoapWebServiceHandler.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSoapWebServiceHandler.cs
index eae97b4a743..6d03900b5b1 100755
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSoapWebServiceHandler.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSoapWebServiceHandler.cs
@@ -335,11 +335,6 @@ namespace System.Web.Services.Protocols
 		
 		private SoapServerMessage Invoke (HttpContext ctx, SoapServerMessage requestMessage)
 		{
-			WebService wsi = requestMessage.Server as WebService;
-			if (wsi != null) {
-				wsi.SetContext (ctx);
-			}
-			
 			SoapMethodStubInfo methodInfo = requestMessage.MethodStubInfo;
 
 			// Assign header values to web service members
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandler.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandler.cs
index a3b82b8eb1a..8727e6f2724 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandler.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandler.cs
@@ -78,13 +78,7 @@ namespace System.Web.Services.Protocols
 		
 		protected object CreateServerInstance ()
 		{
-			object ws = Activator.CreateInstance (ServiceType);
-			WebService wsi = ws as WebService;
-			if (wsi != null) {
-				wsi.SetContext (_context);
-			}
-
-			return ws;
+			return Activator.CreateInstance (ServiceType);
 		}
 	}
 }