qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tom...@apache.org
Subject svn commit: r537033 - in /incubator/qpid/trunk/qpid: ./ dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketProcessor.cs dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
Date Thu, 10 May 2007 23:04:44 GMT
Author: tomasr
Date: Thu May 10 16:04:43 2007
New Revision: 537033

URL: http://svn.apache.org/viewvc?view=rev&rev=537033
Log:
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
........

Removed:
    incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketProcessor.cs
Modified:
    incubator/qpid/trunk/qpid/   (props changed)
    incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs

Propchange: incubator/qpid/trunk/qpid/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs?view=diff&rev=537033&r1=537032&r2=537033
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
(original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
Thu May 10 16:04:43 2007
@@ -118,16 +118,16 @@
          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);



Mime
View raw message