Author: gonzalo
Date: 2005-04-09 16:45:29 -0400 (Sat, 09 Apr 2005)
New Revision: 42746
Modified:
trunk/mcs/class/System/System.Net.Sockets/ChangeLog
trunk/mcs/class/System/System.Net.Sockets/Socket.cs
Log:
2005-04-09 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* Socket.cs: invoke the callback after scheduling the next request for
the socket. Fixes bug #74539.
Modified: trunk/mcs/class/System/System.Net.Sockets/ChangeLog
===================================================================
--- trunk/mcs/class/System/System.Net.Sockets/ChangeLog 2005-04-09 20:34:07 UTC
(rev 42745)
+++ trunk/mcs/class/System/System.Net.Sockets/ChangeLog 2005-04-09 20:45:29 UTC
(rev 42746)
@@ -1,3 +1,8 @@
+2005-04-09 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * Socket.cs: invoke the callback after scheduling the next request for
+ the socket. Fixes bug #74539.
+
2005-04-08 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* Socket.cs: update socket connected status in an async request finishes
Modified: trunk/mcs/class/System/System.Net.Sockets/Socket.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Sockets/Socket.cs 2005-04-09 20:34:07 UTC
(rev 42745)
+++ trunk/mcs/class/System/System.Net.Sockets/Socket.cs 2005-04-09 20:45:29 UTC
(rev 42746)
@@ -104,8 +104,6 @@
public void Complete ()
{
IsCompleted = true;
- if (callback != null)
- callback (this);
Queue queue = null;
if (operation == SocketOperation.Receive ||
operation == SocketOperation.ReceiveFrom) {
@@ -114,22 +112,24 @@
queue = Sock.writeQ;
}
- if (queue == null)
- return;
+ if (queue != null) {
+ SocketAsyncCall sac = null;
+ SocketAsyncResult req = null;
+ lock (queue) {
+ queue.Dequeue (); // remove
ourselves
+ if (queue.Count > 0) {
+ req =
(SocketAsyncResult) queue.Peek ();
+ Worker worker = new
Worker (req);
+ sac = GetDelegate
(worker, req.operation);
+ }
+ }
- SocketAsyncCall sac = null;
- SocketAsyncResult req = null;
- lock (queue) {
- queue.Dequeue (); // remove ourselves
- if (queue.Count > 0) {
- req = (SocketAsyncResult)
queue.Peek ();
- Worker worker = new Worker
(req);
- sac = GetDelegate (worker,
req.operation);
- }
+ if (sac != null)
+ sac.BeginInvoke (null, req);
}
- if (sac != null)
- sac.BeginInvoke (null, req);
+ if (callback != null)
+ callback (this);
}
SocketAsyncCall GetDelegate (Worker worker,
SocketOperation op)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches