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

[Commits to the Asterisk SCF project code repositories]

branch "transfer" has been updated
       via  f671edf2e45dacba44cd029ad91eef19b79e50e6 (commit)
      from  3db2d797682558f57434654fd64f8f8295d31a64 (commit)

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


- Log -----------------------------------------------------------------
commit f671edf2e45dacba44cd029ad91eef19b79e50e6
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Oct 13 15:03:57 2010 -0230

    Fix a bug where the bridge's session state record was not properly set
    to 'connected'

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 6495f29..855f1ef 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -322,7 +322,6 @@ namespace BridgeService
             mBridge->sessionConnected(source);
             std::vector<BridgeImpl::BridgeSessionPtr> sessions(mBridge->currentSessions());
             std::for_each(sessions.begin(), sessions.end(), ConnectImpl(source));
-
         }
 
         void flashed(const AsteriskSCF::SessionCommunications::V1::SessionPrx& source, const Ice::Current&)
@@ -631,6 +630,7 @@ void AsteriskSCF::BridgeService::BridgeImpl::replaceSession(const AsteriskSCF::S
             {
                 if((*currentInfo)->currentState != "ready")
                 {
+                    (*i)->setConnected();
                     (*i)->setConnector(mSplicer.connect((*i)->getSession()));
                 }
             }
@@ -720,7 +720,7 @@ void AsteriskSCF::BridgeService::BridgeImpl::sessionConnected(const AsteriskSCF:
     lg(Debug) << __FUNCTION__ << ": session connected " << session->ice_toString() ;
     boost::unique_lock<boost::shared_mutex> lock(mLock);
     std::vector<BridgeSessionPtr>::iterator i = find_if(mSessions.begin(), mSessions.end(), AsteriskSCF::BridgeService::FindImpl(session));
-    if(i != mSessions.end())
+    if(i != mSessions.end() && !(*i)->isConnected())
     {
         (*i)->setConnected();
         (*i)->setConnector(mSplicer.connect(session));

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


-- 
asterisk-scf/integration/bridging.git