diff options
| author | Alan Conway <aconway@apache.org> | 2009-02-04 21:31:23 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-02-04 21:31:23 +0000 |
| commit | 3de263a28e2421bb916e1da0cf0f09881801785c (patch) | |
| tree | 9f809de1dc1ab5694a38e0f6a94b7f19711bf2dc /cpp/src/qpid/cluster/ConnectionMap.cpp | |
| parent | 5b50014477ef0b9096c017af8fb85ac5693e673e (diff) | |
| download | qpid-python-3de263a28e2421bb916e1da0cf0f09881801785c.tar.gz | |
Fix race condition with deleted local connections.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@740900 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/ConnectionMap.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/ConnectionMap.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/ConnectionMap.cpp b/cpp/src/qpid/cluster/ConnectionMap.cpp index 9dc6210666..1a49a4d663 100644 --- a/cpp/src/qpid/cluster/ConnectionMap.cpp +++ b/cpp/src/qpid/cluster/ConnectionMap.cpp @@ -48,7 +48,9 @@ void ConnectionMap::erase(const ConnectionId& id) { ConnectionMap::ConnectionPtr ConnectionMap::get(const ConnectionId& id) { Map::const_iterator i = map.find(id); if (i == map.end()) { - assert(id.getMember() != cluster.getId()); + // Deleted local connection. + if(id.getMember() == cluster.getId()) + return 0; // New remote connection, create a shadow. std::ostringstream mgmtId; mgmtId << id; |