summaryrefslogtreecommitdiff
path: root/qpid/dotnet
diff options
context:
space:
mode:
authorTomas Restrepo <tomasr@apache.org>2007-05-10 23:04:43 +0000
committerTomas Restrepo <tomasr@apache.org>2007-05-10 23:04:43 +0000
commit90d1c7d53cad700cab61ac08a556cd07cb388917 (patch)
tree88b44581c9866ec734e35d2cd3c310b225cbcc95 /qpid/dotnet
parentcac9db624b611981e9d8ecf64561fe7ed7e173a6 (diff)
downloadqpid-python-90d1c7d53cad700cab61ac08a556cd07cb388917.tar.gz
Merged revisions 537029 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r537029 | tomasr | 2007-05-10 17:59:58 -0500 (Thu, 10 May 2007) | 1 line Fixed race condition introduced by QPID-398, removed unneeded files ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@537033 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/dotnet')
-rw-r--r--qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketProcessor.cs0
-rw-r--r--qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs8
2 files changed, 4 insertions, 4 deletions
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketProcessor.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketProcessor.cs
deleted file mode 100644
index e69de29bb2..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketProcessor.cs
+++ /dev/null
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
index 607b7ca422..1fb07fb245 100644
--- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
@@ -118,16 +118,16 @@ namespace Qpid.Client.Transport.Socket.Blocking
try
{
Queue frames = _amqpChannel.EndRead(result);
- // if we're not stopping, post a read again
- bool stopping = _stopEvent.WaitOne(0, false);
- if ( !stopping )
- _amqpChannel.BeginRead(new AsyncCallback(OnAsyncReadDone), null);
// process results
foreach ( IDataBlock dataBlock in frames )
{
_protocolListener.OnMessage(dataBlock);
}
+ // if we're not stopping, post a read again
+ bool stopping = _stopEvent.WaitOne(0, false);
+ if ( !stopping )
+ _amqpChannel.BeginRead(new AsyncCallback(OnAsyncReadDone), null);
} catch ( Exception e )
{
_protocolListener.OnException(e);