[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  83183b7fa7f43fc7d5aa90b345f72278ddbfbd33 (commit)
      from  2fe0e74da227b8d3aa27418791360bda36b36ce2 (commit)

Summary of changes:
 src/BridgeImpl.cpp    |    8 ++++++++
 test/TestBridging.cpp |    4 ++++
 2 files changed, 12 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit 83183b7fa7f43fc7d5aa90b345f72278ddbfbd33
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Aug 30 09:39:41 2010 -0230

    Replacing propogation of terminated callback to admin endpoint which was erroneously removed during
    shutdown refactoring.

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 7a0fa4b..eb4afb3 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -548,6 +548,8 @@ size_t Hydra::BridgeService::BridgeImpl::endpointTerminated(const Hydra::Core::E
     mLogger.getDebugStream() << __FUNCTION__ << ": endpoint terminated from " << endpointIdToString(id) << std::endl;
     size_t endpointCount(0);
 
+    Hydra::Session::V1::SignalCallbackPrx callback;
+
     //
     // Find out if we have an endpoint we need to "unplug"
     //
@@ -569,10 +571,16 @@ size_t Hydra::BridgeService::BridgeImpl::endpointTerminated(const Hydra::Core::E
         }
         if(mAdminEndpoint.get() != 0)
         {
+            callback = mAdminEndpoint->endpoint->callback;
             ++endpointCount;
         }
     }
 
+    if(callback)
+    {
+        callback->terminated(id, response);
+    }
+
     //
     // This endpoint is now "out there" and not known to any other part of the bridge. Disconnecting the media is the last thing we can do.
     //
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 982eddd..7514bdb 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -1937,3 +1937,7 @@ BOOST_AUTO_TEST_CASE(BridgeMonitor)
     adapter->destroy();
 }
 
+BOOST_AUTO_TEST_CASE(BridgeTerminateCallbackFromUA)
+{
+    BOOST_CHECK(true);
+}

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


-- 
asterisk-scf/integration/bridging.git