Author: astitcher
Date: Tue Mar 10 19:08:18 2009
New Revision: 752220
URL: http://svn.apache.org/viewvc?rev=752220&view=rev
Log:
Really close the potential race on the client between sending
and closing a connection
Modified:
qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp?rev=752220&r1=752219&r2=752220&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp Tue Mar 10 19:08:18 2009
@@ -92,8 +92,6 @@
framing::ProtocolVersion version;
bool initiated;
-
- sys::Mutex closedLock;
bool closed;
bool joined;
@@ -185,7 +183,7 @@
}
void TCPConnector::connect(const std::string& host, int port){
- Mutex::ScopedLock l(closedLock);
+ Mutex::ScopedLock l(lock);
assert(closed);
try {
socket.connect(host, port);
@@ -207,7 +205,7 @@
}
void TCPConnector::init(){
- Mutex::ScopedLock l(closedLock);
+ Mutex::ScopedLock l(lock);
assert(joined);
ProtocolInitiation init(version);
writeDataBlock(init);
@@ -218,7 +216,7 @@
bool TCPConnector::closeInternal() {
bool ret;
{
- Mutex::ScopedLock l(closedLock);
+ Mutex::ScopedLock l(lock);
ret = !closed;
if (!closed) {
closed = true;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
