[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  d46ccb8786c3a461318fbec73918b9b06b144f08 (commit)
      from  ee10b2670a05948fce905176d6689b97ac683954 (commit)

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


- Log -----------------------------------------------------------------
commit d46ccb8786c3a461318fbec73918b9b06b144f08
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Aug 26 14:35:47 2010 -0230

    Fix incorrect call being used during bridge shutdown. It was calling
    terminated() via the callback interface, whereas its supposed to use
    the SessionCommands::terminate() method.

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 73b2601..bdf03e4 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -104,7 +104,7 @@ namespace BridgeService
                 assert(p != 0);
                 if(p->callback)
                 {
-                    p->callback->terminated(mId, mResponseCode);
+                    p->command->terminate(mId);
                 }
                 if(b.connector)
                 {
@@ -473,7 +473,7 @@ void Hydra::BridgeService::BridgeImpl::shutdown(const Ice::Current& current)
     //
     Hydra::Session::V1::ResponseCodePtr response(new Hydra::Session::V1::ResponseCode(0));
 
-    std::for_each(mEndpoints.begin(), mEndpoints.end(), Hydra::BridgeService::BridgeShutdownFunctor(sourceId, response));
+    std::for_each(mEndpoints.begin(), mEndpoints.end(), Hydra::BridgeService::BridgeShutdownFunctor(mBridgeId, response));
 
     mLogger.getInfoStream() << current.adapter->getCommunicator()->identityToString(current.id) << ": is shutdown." << std::endl;
     mEvents->stopped();

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


-- 
asterisk-scf/integration/bridging.git