[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  d0e58c0cb6e359bd655d59d548e790e91b0b882f (commit)
      from  43ae7858aeb86628f5c848960ffe012ab7f99fb2 (commit)

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


- Log -----------------------------------------------------------------
commit d0e58c0cb6e359bd655d59d548e790e91b0b882f
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Aug 26 16:04:42 2010 -0230

    Fixed introduced in the last commit that would leave the bridge "up" if the
    admin endpoint was the last remaining endpoint on the bridge.

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 1205029..2c94033 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -566,17 +566,26 @@ size_t Hydra::BridgeService::BridgeImpl::endpointTerminated(const Hydra::Core::E
                     ep = mAdminEndpoint;
                     mAdminEndpoint.reset(0);
                 }
-                else
-                {
-                    ++endpointCount;
-                }
             }
         }
+        if(mAdminEndpoint.get() != 0)
+        {
+            ++endpointCount;
+        }
     }
 
+    //
+    // 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.
+    //
     if(ep.get() != 0 && ep->connector)
     {
-        ep->connector->unplug();
+        try
+        {
+            ep->connector->unplug();
+        }
+        catch(const Ice::Exception&)
+        {
+        }
     }
     return endpointCount;
 }

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


-- 
asterisk-scf/integration/bridging.git