[asterisk-scf-commits] asterisk-scf/release/bridging.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  bc05637e28f4adb42614f4e57634cf60f84feb59 (commit)
       via  498aeb205671b7bc759683445852d2cb2628fd80 (commit)
      from  6cffd17652efd700c25edd84d66659d69681b78f (commit)

Summary of changes:
 src/BridgeManagerImpl.cpp |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit bc05637e28f4adb42614f4e57634cf60f84feb59
Merge: 498aeb2 6cffd17
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Jun 21 13:02:08 2011 -0500

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/bridging


commit 498aeb205671b7bc759683445852d2cb2628fd80
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Jun 21 13:01:10 2011 -0500

    Add try-catch block around state replicator call in the bridge manager.

diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index be58b67..f2696c0 100644
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -460,7 +460,14 @@ void BridgeManagerImpl::update()
         ++mState->serial;
         ReplicatedStateItemSeq seq;
         seq.push_back(getState());
-        mReplicator->setState(seq);
+        try
+        {
+            mReplicator->setState(seq);
+        }
+        catch (const Ice::Exception& ex)
+        {
+            mLogger(Warning) << "Caught exception while trying to replicate bridge manager state: " << ex.what();
+        }
     }
 }
 

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


-- 
asterisk-scf/release/bridging.git