svn commit: r724330 - in /incubator/qpid/trunk/qpid/cpp/src/qpid/cluster: Connection.cpp OutputInterceptor.cpp

[aconway]

Author: aconway
Date: Mon Dec  8 04:04:02 2008
New Revision: 724330

URL: http://svn.apache.org/viewvc?rev=724330&view=rev
Log:
src/qpid/cluster/OutputInterceptor.cpp: revert locking.

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp?rev=724330&r1=724329&r2=724330&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp Mon Dec  8 
04:04:02 2008
@@ -91,7 +91,7 @@
 // which stocks up the write buffers with data.
 //
 void Connection::deliverDoOutput(uint32_t requested) {
-
+    assert(!catchUp);
     output.deliverDoOutput(requested);
 }
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp?rev=724330&r1=724329&r2=724330&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp 
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp Mon 
Dec  8 04:04:02 2008
@@ -76,12 +76,10 @@
 
     // Run the real doOutput() till we have added the requested data or 
there's nothing to output.
     sent = 0;
-    {
-    sys::Mutex::ScopedUnlock u(lock);
     do {
+    sys::Mutex::ScopedUnlock u(lock);
         moreOutput = parent.getBrokerConnection().doOutput();
     } while (sent < requested && moreOutput);
-    }
     sent += buf;                // Include buffered data in the sent total.
 
     QPID_LOG(trace, "Delivered doOutput: requested=" << requested << " 
output=" << sent << " more=" << moreOutput);