summaryrefslogtreecommitdiff
path: root/connectionList.cpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2008-02-04 21:07:50 +0000
committerChristian Pointner <equinox@anytun.org>2008-02-04 21:07:50 +0000
commit1fd035fb9c2d659deea96d2ac5675869c7105566 (patch)
treea35e604644846f7fa0ea3878c062ab0cfa30a30d /connectionList.cpp
parentfixed bug @ sync (diff)
fixed Deadlock @ connecetionlist
Diffstat (limited to 'connectionList.cpp')
-rw-r--r--connectionList.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/connectionList.cpp b/connectionList.cpp
index f4d9cde..de863eb 100644
--- a/connectionList.cpp
+++ b/connectionList.cpp
@@ -66,10 +66,8 @@ const ConnectionMap::iterator ConnectionList::getConnection(u_int16_t mux)
}
-ConnectionParam & ConnectionList::getOrNewConnection(u_int16_t mux)
+ConnectionParam & ConnectionList::getOrNewConnectionUnlocked(u_int16_t mux)
{
- Lock lock(mutex_);
-
ConnectionMap::iterator it = connections_.find(mux);
if(it!=connections_.end())
return it->second;