Merge branch 'master' of https://github.com/real-logic/Aeron

real-logic · Feb 23, 2017 · 1ee8dda · 1ee8dda
2 parents 03c585f + de49102
commit 1ee8dda
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/aeron-client/src/main/cpp/ClientConductor.cpp b/aeron-client/src/main/cpp/ClientConductor.cpp
@@ -216,17 +216,13 @@ void ClientConductor::addDestination(std::int64_t publicationRegistrationId, con
 {
     verifyDriverIsActive();
 
-    std::lock_guard<std::recursive_mutex> lock(m_adminLock);
-
     m_driverProxy.addDestination(publicationRegistrationId, endpointChannel);
 }
 
 void ClientConductor::removeDestination(std::int64_t publicationRegistrationId, const std::string& endpointChannel)
 {
     verifyDriverIsActive();
 
-    std::lock_guard<std::recursive_mutex> lock(m_adminLock);
-
     m_driverProxy.removeDestination(publicationRegistrationId, endpointChannel);
 }