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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  045fd22a8b91019e297fde1861d51414bbc0dd5b (commit)
      from  80509d044f08a90c8fffa8f7524b8ad741d6f250 (commit)

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


- Log -----------------------------------------------------------------
commit 045fd22a8b91019e297fde1861d51414bbc0dd5b
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Apr 27 09:52:34 2011 -0500

    Patch for recent changes to SmartProxy.

diff --git a/src/BasicRoutingServiceApp.cpp b/src/BasicRoutingServiceApp.cpp
index 111f0a1..9039c48 100644
--- a/src/BasicRoutingServiceApp.cpp
+++ b/src/BasicRoutingServiceApp.cpp
@@ -286,16 +286,19 @@ void BasicRoutingServiceApp::initialize()
         lg(Error) << "Problems in " << mAppName << " initialization(): " << exception.what();
     }
 
-    mBridgeManager = AsteriskSCF::SmartProxy::SmartProxy<BridgeManagerPrx>(
-        mServiceLocator,
-        new ServiceLocatorParams(BridgeServiceDiscoveryCategory),
-        lg);
-    mSessionRouter->setBridgeManager(mBridgeManager);
-
-    if (!mBridgeManager.isInitialized())
+    try
     {
-        lg(Debug) << "Probabaly safe to ignore ServiceNotFound during startup. Will attempt to locate Bridge Service again when it is needed.";
+        mBridgeManager = AsteriskSCF::SmartProxy::SmartProxy<BridgeManagerPrx>(
+            mServiceLocator,
+            new ServiceLocatorParams(BridgeServiceDiscoveryCategory),
+            lg);
     }
+    catch(const AsteriskSCF::Core::Discovery::V1::ServiceNotFound&)
+    {
+        lg(Debug) << "BridgeManager not found... safe to ignore ServiceNotFound during startup.";
+    }
+
+    mSessionRouter->setBridgeManager(mBridgeManager);
 }
 
 /**

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


-- 
asterisk-scf/release/routing.git