[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  2daf93b1319e2d30b60e08a10e78d8d90e18cf3d (commit)
       via  14e44c9e6628d267d1846d9580cccf96dc0e245f (commit)
      from  b887cd5d408e02b09d9afb40e34557d829de1f7d (commit)

Summary of changes:
 src/BridgeImpl.cpp   |   16 +++++++---------
 src/MediaSplicer.cpp |    9 ++++-----
 2 files changed, 11 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 src/BridgeImpl.cpp
 mode change 100644 => 100755 src/MediaSplicer.cpp


- Log -----------------------------------------------------------------
commit 2daf93b1319e2d30b60e08a10e78d8d90e18cf3d
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Oct 27 12:23:39 2010 -0230

    Fix some comments in the MediaSplicer.

diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
old mode 100644
new mode 100755
index b2f02fd..a7048f6
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -326,8 +326,7 @@ namespace BridgeService
         bool needMixing()
         {
             //
-            // XXX:
-            // We are only supporting single stream with two endpoints for the Alpha, so no mixing will 
+            // TODO: We are only supporting single stream with two endpoints for the moment, so no mixing will 
             // be required.
             //
             return false;
@@ -336,9 +335,9 @@ namespace BridgeService
         bool hasPreferredCodecOverride()
         {
             //
-            // XXX: In some configurations, transcoding might be forced even if there is only two call 
-            // participants and they can communicate with common codecs. This will not be supported for the
-            // alpha.
+            // TODO: In some configurations, transcoding might be forced even if there is only two call 
+            // participants and they can communicate with common codecs. In any case, this is not supported 
+            // at the moment.
             //
             return false;
         }

commit 14e44c9e6628d267d1846d9580cccf96dc0e245f
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Oct 27 12:16:49 2010 -0230

    Make the retry method consistent.

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
old mode 100644
new mode 100755
index 8df513f..9c1e5c1
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -487,22 +487,20 @@ void AsteriskSCF::BridgeService::BridgeImpl::addSessions(const AsteriskSCF::Sess
             AsteriskSCF::SessionCommunications::V1::SessionInfoPtr info;
             try
             {
-                size_t count = 0;
-                bool done = false;
-                size_t sleepInterval = 500; // XXX Make configurable.
-                size_t numberOfRetries = 5;
-                while(!done && count < numberOfRetries)
+                RetryPolicy policy(5, 500);
+                //
+                // canRetry should never return false since we throw ourselves out of this loop. But 
+                // we'll do it here in case we decide to do something else.
+                //
+                while(policy.canRetry())
                 {
                     try
                     {
                         info = (*i)->setBridge(mPrx, mSessionListenerPrx);
-                        done = true;
                     }
                     catch(const Ice::ConnectionLostException& ex)
                     {
-                        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(sleepInterval));
-                        ++count;
-                        if(count == numberOfRetries)
+                        if(!policy.retry())
                         {
                             throw;
                         }

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


-- 
asterisk-scf/integration/bridging.git