From: Atsushi Eno <atsushieno@gmail.com>
Date: Thu, 10 Dec 2009 06:02:50 +0000 (-0000)
Subject: 2009-12-10  Atsushi Enomoto  <atsushi@ximian.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=384a2f519d0656f12c62e5fe6436c8eefe712f7d;p=mono.git

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 5b7f4e028bb..555de40b5f1 100755
--- 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 4ea41e10597..983b57d517b 100644
--- 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 ();