2006-12-22 Atsushi Enomoto <atsushi@ximian.com>

	* HttpSoapWebServiceHandler.cs : (SerializeFault) requestMessage
	  could be null.

svn path=/branches/atsushi/mcs/; revision=69928

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 49c24a3365ac3ff37ed4a81a8c02ae08529b68ab..5c4b53fa45485f70632fe6a85fd7a88fcd48d0da 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,8 @@
+2006-12-22  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * HttpSoapWebServiceHandler.cs : (SerializeFault) requestMessage
+         could be null.
+
 2006-12-21  Atsushi Enomoto  <atsushi@ximian.com>
 
        * WebServiceHelper.cs :

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 3302b242e4fb6b56238eee3c54c2183bc5014db9..f01e7fe6708ed9ff813029e0698621ac963e4df2 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSoapWebServiceHandler.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSoapWebServiceHandler.cs
@@ -354,7 +354,7 @@ namespace System.Web.Services.Protocols
                void SerializeFault (HttpContext context, SoapServerMessage requestMessage, Exception ex)
                {
                        SoapException soex = ex as SoapException;
-                       if (soex == null) soex = new SoapException (ex.Message, WebServiceHelper.ServerFaultCode (requestMessage.IsSoap12), ex);
+                       if (soex == null) soex = new SoapException (ex.Message, WebServiceHelper.ServerFaultCode (requestMessage != null && requestMessage.IsSoap12), ex);
 
                        SoapServerMessage faultMessage;
                        if (requestMessage != null)