2009-12-10 Atsushi Enomoto <atsushi@ximian.com>

	* HttpRequestChannel.cs : WebException.Response might be null.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index 5b7f4e028bb741b3a1e1046ea1d185329261623e..555de40b5f1525dfbc06a131f758002f33d080c1 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-10  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * HttpRequestChannel.cs : WebException.Response might be null.
+
 2009-12-04  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ReplyChannelBase.cs : added listener property.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs
index 4ea41e105977e30af1993b96cc2a344089f2b0ef..983b57d517b184b7df40e3516425bc1504ed4dd1 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs
@@ -184,6 +184,10 @@ namespace System.ServiceModel.Channels
                                resstr = res.GetResponseStream ();
                        } catch (WebException we) {
                                res = we.Response;
+                               if (res == null) {
+                                       channelResult.Complete (we);
+                                       return;
+                               }
                                try {
                                        // The response might contain SOAP fault. It might not.
                                        resstr = res.GetResponseStream ();