[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  2fe0e74da227b8d3aa27418791360bda36b36ce2 (commit)
       via  12cb19c8f34e2dea1fda7d6a16026298e1d1e26a (commit)
      from  a952952596d1a48e5b3fc575c9355a14e53f56bf (commit)

Summary of changes:
 src/BridgeImpl.cpp |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 2fe0e74da227b8d3aa27418791360bda36b36ce2
Merge: 12cb19c a952952
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 30 09:02:40 2010 -0300

    Merge branch 'master' of git.asterisk.org:asterisk-scf/integration/bridging


commit 12cb19c8f34e2dea1fda7d6a16026298e1d1e26a
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 30 09:02:08 2010 -0300

    Fix a deadlock in removeEndpoint by removing a lock. Recursive locking? No!

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index bdf03e4..3ad749d 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -378,7 +378,6 @@ void Hydra::BridgeService::BridgeImpl::addEndpoint(const Hydra::Core::Endpoint::
 void Hydra::BridgeService::BridgeImpl::removeEndpoint(const Hydra::Core::Endpoint::V1::EndpointIdPtr& ep, const Ice::Current& current)
 {
     mLogger.getTraceStream() << __FUNCTION__ << ":" << current.adapter->getCommunicator()->identityToString(current.id) << std::endl;
-    boost::unique_lock<boost::shared_mutex> lock(mLock);
     statePreCheck();
     if(ep == 0)
     {

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/bridging.git