* Methods.cs, TypeStubManager.cs, SoapMessage.cs: Removed TODO comment.

	* SoapDocumentationHandler.cs: Check that the documentation page exist.
	* SoapHttpClientProtocol.cs: Removed cast from WebResponse to
	  HttpWebResponse. This fixes bug #51281.

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

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 14245e13877e9e2ecd75576e64d7937a014f8b4c..d906b9f6f8da59e14161ba3405fa4aef7fd03edf 100644 (file)
--- 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,10 @@
+2003-11-24  Lluis Sanchez Gual <lluis@ximian.com>
+
+       * Methods.cs, TypeStubManager.cs, SoapMessage.cs: Removed TODO comment.
+       * SoapDocumentationHandler.cs: Check that the documentation page exist.
+       * SoapHttpClientProtocol.cs: Removed cast from WebResponse to
+         HttpWebResponse. This fixes bug #51281.
+
 2003-11-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * HttpSoapWebServiceHandler.cs: WebException is ok here for wrong 

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/Methods.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/Methods.cs
index 01ddafb82efd94c3801cd164e7a12cadc282dcdd..3296bb5ca6fa7eb8b8cec5630a41bf012793fd51 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/Methods.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/Methods.cs
@@ -7,9 +7,6 @@
 //
 // (C) 2003 Ximian, Inc.
 //
-// TODO:
-//    
-//
 
 using System.Reflection;
 using System.Collections;

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs
index 38fc86257fd0eca69c2aafa9a57b013aa23ab7e4..368adb80197fc4d34a13a7cd830f4fd514ccf335 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs
@@ -62,6 +62,10 @@ namespace System.Web.Services.Protocols
                                vpath += "/" + help;
 
                        string physPath = Path.Combine (path, help);
+                       
+                       if (!File.Exists (physPath))
+                               throw new InvalidOperationException ("Documentation page '" + physPath + "' not found");
+
                        _pageHandler = PageParser.GetCompiledPageInstance (vpath, physPath, context);
                                
                }

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHttpClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHttpClientProtocol.cs
index f4e6fe3619a93651e0c343a97628b02f55e84dea..ba5fb23bfb15c2ccbf36c39edc02f86b15bfeed8 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHttpClientProtocol.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHttpClientProtocol.cs
@@ -207,13 +207,20 @@ namespace System.Web.Services.Protocols {
                //    \r
                object [] ReceiveResponse (WebResponse response, SoapClientMessage message, SoapExtension[] extensions)\r
                {\r
-                       HttpWebResponse http_response = (HttpWebResponse) response;\r
-                       HttpStatusCode code = http_response.StatusCode;\r
                        SoapMethodStubInfo msi = message.MethodStubInfo;\r
-\r
-                       if (!(code == HttpStatusCode.Accepted || code == HttpStatusCode.OK || code == HttpStatusCode.InternalServerError))\r
-                               throw new WebException ("Request error. Return code was: " + http_response.StatusCode);\r
-\r
+                       HttpWebResponse http_response = response as HttpWebResponse;\r
+                       bool isSuccessful = true;\r
+                       \r
+                       if (http_response != null)\r
+                       {\r
+                               HttpStatusCode code = http_response.StatusCode;\r
+       \r
+                               if (!(code == HttpStatusCode.Accepted || code == HttpStatusCode.OK || code == HttpStatusCode.InternalServerError))\r
+                                       throw new WebException ("Request error. Return code was: " + http_response.StatusCode);\r
+                                       \r
+                               isSuccessful = (code != HttpStatusCode.InternalServerError);\r
+                       }\r
+                       \r
                        //\r
                        // Remove optional encoding\r
                        //\r
@@ -237,7 +244,6 @@ namespace System.Web.Services.Protocols {
                        StreamReader reader = new StreamReader (stream, encoding, false);\r
                        XmlTextReader xml_reader = new XmlTextReader (reader);\r
 \r
-                       bool isSuccessful = (code != HttpStatusCode.InternalServerError);\r
                        SoapHeaderCollection headers;\r
                        object content;\r
 \r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs
index 499eba92aabe8549d6778d79dbcec587186a64db..ac8f8195086920b720f5455ff5bbb8f556bb6150 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs
@@ -7,9 +7,6 @@
 //\r
 // Copyright (C) Tim Coleman, 2002\r
 //\r
-// TODO:\r
-//    Need to set the stream variable from the outside, or the constructor.\r
-//\r
 \r
 using System.IO;\r
 using System.Web.Services;\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/TypeStubManager.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/TypeStubManager.cs
index eb17a2bf66f36d45915824aca854f32529d2e221..269238cadfbc696d5d256a1f49cb9d940924db17 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/TypeStubManager.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/TypeStubManager.cs
@@ -7,9 +7,6 @@
 //
 // (C) 2003 Ximian, Inc.
 //
-// TODO:
-//    
-//
 
 using System.Reflection;
 using System.Collections;