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

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  e647bc9cb1ccf292f15ba40fa2b7c24a786915d2 (commit)
      from  9e272ccc9084f8a4aabdf1e172ad204a454bfba7 (commit)

Summary of changes:
 src/BridgeManagerImpl.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit e647bc9cb1ccf292f15ba40fa2b7c24a786915d2
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Apr 12 15:30:08 2012 -0230

    Hmm... shadowing bug. I wonder why GCC didn't complain this time.

diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index 94f39ed..fad3bec 100755
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -833,7 +833,7 @@ void BridgeManagerImpl::createBridgeReplica(const BridgeStateItemPtr& state)
         mLogger(Trace) << FUNLOG;
         boost::unique_lock<boost::shared_mutex> lock(mLock);
         Ice::Identity id(mAdapter->getCommunicator()->stringToIdentity(state->bridgeId));
-        BridgePrx prx(BridgePrx::uncheckedCast(mAdapter->createProxy(id)));
+        prx = BridgePrx::uncheckedCast(mAdapter->createProxy(id));
         BridgeListenerMgrPtr mgr(new BridgeListenerMgr(mAdapter->getCommunicator(), state->bridgeId, prx));
     
         BridgeServantPtr bridge = BridgeServant::create(mAdapter, mgr, mReplicationContext->getReplicator(), mLogger, state);
@@ -843,7 +843,6 @@ void BridgeManagerImpl::createBridgeReplica(const BridgeStateItemPtr& state)
         BridgeInfo info;
         info.servant = bridge;
         info.proxy = BridgePrx::uncheckedCast(obj);
-        prx = info.proxy;
         mBridges.push_back(info);
     }
 

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


-- 
asterisk-scf/integration/bridging.git