[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  7f8142c68520f3bb0786f7faec38f0c017a7eae7 (commit)
      from  05b4f9eb527c80f2a716778673d4c771ece0b500 (commit)

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


- Log -----------------------------------------------------------------
commit 7f8142c68520f3bb0786f7faec38f0c017a7eae7
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Oct 13 09:51:13 2010 -0230

    Fix a bug where the bridge's session sequence was modified outside of a locked block.

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index a52a2ed..033a501 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -475,7 +475,6 @@ void AsteriskSCF::BridgeService::BridgeImpl::replaceSession(const AsteriskSCF::S
         {
             infoSeq.push_back((*i)->setBridge(mPrx, mSessionListenerPrx));
             newMembers.push_back(new BridgeSession(*i, 0, false));
-            mSessions.push_back(newMembers.back());
         }
         catch(const Ice::Exception&)
         {
@@ -498,6 +497,7 @@ void AsteriskSCF::BridgeService::BridgeImpl::replaceSession(const AsteriskSCF::S
         std::vector<AsteriskSCF::SessionCommunications::V1::SessionInfoPtr>::iterator currentInfo = infoSeq.begin();
         for(std::vector<BridgeSessionPtr>::iterator i = newMembers.begin(); i != newMembers.end() ; ++i, ++currentInfo)
         {
+            mSessions.push_back(*i);
             assert(currentInfo != infoSeq.end());
             if((*currentInfo)->currentState != "ready")
             {

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


-- 
asterisk-scf/integration/bridging.git