From: Gonzalo Paniagua Javier <gonzalo.mono@gmail.com>
Date: Sun, 18 Oct 2009 02:09:20 +0000 (-0000)
Subject: 2009-10-17 Gonzalo Paniagua Javier <gonzalo@novell.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=eafc6c8b08f73eb39f546e1ebd9ee5f2e07c636c;p=mono.git

2009-10-17 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* WebConnectionStream.cs: add 3 missing DoCallback() calls in
	EndRead/EndWrite.


svn path=/trunk/mcs/; revision=144315
---

diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
index 98af8b7e681..9180c3b3319 100644
--- a/mcs/class/System/System.Net/ChangeLog
+++ b/mcs/class/System/System.Net/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-17 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+	* WebConnectionStream.cs: add 3 missing DoCallback() calls in
+	EndRead/EndWrite.
+
 2009-09-29 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
 	* EndPointListener.cs: fix matching a listener in presence of a query
diff --git a/mcs/class/System/System.Net/WebConnectionStream.cs b/mcs/class/System/System.Net/WebConnectionStream.cs
index 00fcd059681..bafd6e73259 100644
--- a/mcs/class/System/System.Net/WebConnectionStream.cs
+++ b/mcs/class/System/System.Net/WebConnectionStream.cs
@@ -400,6 +400,7 @@ namespace System.Net
 					nextReadCalled = true;
 					cnc.Close (true);
 					result.SetCompleted (false, exc);
+					result.DoCallback ();
 					throw;
 				}
 
@@ -571,10 +572,12 @@ namespace System.Net
 				throw result.Exception;
 
 			try {
-				cnc.EndWrite (request, result.InnerAsyncResult);
+				cnc.EndWrite2 (request, result.InnerAsyncResult);
 				result.SetCompleted (false, 0);
+				result.DoCallback ();
 			} catch (Exception e) {
 				result.SetCompleted (false, e);
+				result.DoCallback ();
 				throw;
 			} finally {
 				if (sendChunked) {