[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  e0295f94739862ed72957365d4768fbfd81b0400 (commit)
      from  64dfa5dda9cf5bc5c559a2c57590487ea5f68d40 (commit)

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


- Log -----------------------------------------------------------------
commit e0295f94739862ed72957365d4768fbfd81b0400
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Sep 15 11:05:48 2010 -0230

    Remove bug where bridge was calling start on sessions when they were added.

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 834027e..127af28 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -270,7 +270,6 @@ void AsteriskSCF::BridgeService::BridgeImpl::addSessions(const AsteriskSCF::Sess
             //
             if(info->currentState == "ready")
             {
-                (*i)->start();
                 mSessions.push_back(BridgeSession(*i, 0));
             }
             else
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 3a62c2e..9fa711e 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -386,8 +386,19 @@ BOOST_AUTO_TEST_CASE(SimpleBridgingTest)
             BOOST_CHECK(!find(log, "start"));
             channel.commands()->getlog(idB, log);
             BOOST_CHECK(!find(log, "start"));
-            
+
             bridge->addSessions(sessions);
+            //
+            // Check for regression where the bridge was calling start on sessions.
+            //
+            channel.commands()->getlog(idA, log);
+            BOOST_CHECK(!find(log, "start"));
+            channel.commands()->getlog(idB, log);
+            BOOST_CHECK(!find(log, "start"));
+
+            a->start();
+            b->start();
+
             channel.commands()->getlog(idA, log);
             BOOST_CHECK(find(log, "start"));
             channel.commands()->getlog(idB, log);

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


-- 
asterisk-scf/integration/bridging.git