epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

better TransportRegistry::remove()

Browse Source 
now with the same complexity as the original...
This commit is contained in:
Michael Davidsaver
2018-02-06 18:20:33 -08:00
parent 40868b7b8b
commit 24ffccf90d
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/remote/transportRegistry.cpp
View File

@@ -102,19 +102,14 @@ void TransportRegistry::install(const Transport::shared_pointer& ptr)
Transport::shared_pointer TransportRegistry::remove(Transport::shared_pointer const & transport)
{
assert(!!transport);
const Key key(transport->getRemoteAddress(), transport->getPriority());
Transport::shared_pointer ret;
pvd::Lock guard(_mutex);
for(transports_t::iterator it(transports.begin()), end(transports.end());
it != end; ++it)
{
Transport::shared_pointer& tr = it->second;
if(transport.get() == tr.get()) {
ret.swap(it->second);
transports.erase(it);
break;
}
transports_t::iterator it(transports.find(key));
if(it!=transports.end()) {
ret.swap(it->second);
transports.erase(it);
}
return ret;
}