[asterisk-scf-commits] asterisk-scf/integration/routing.git branch "route_replica" updated.

[Commits to the Asterisk SCF project code repositories]

branch "route_replica" has been updated
       via  a6984b9b7ad5b5f0ba7db843876bc90949589dfd (commit)
       via  78ca78031fa588743787655ec5ae2b6444cd68f6 (commit)
      from  f1920658a0f69e0cc57933233c2aebdfd089a5c3 (commit)

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


- Log -----------------------------------------------------------------
commit a6984b9b7ad5b5f0ba7db843876bc90949589dfd
Merge: 78ca780 f192065
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Apr 27 11:35:04 2011 -0500

    Merge branch 'route_replica' of gitdepot:asterisk-scf/integration/routing into route_replica


commit 78ca78031fa588743787655ec5ae2b6444cd68f6
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Apr 27 11:32:40 2011 -0500

    Better handling of initialization of replication service proxy.

diff --git a/src/BasicRoutingServiceApp.cpp b/src/BasicRoutingServiceApp.cpp
index 5697ba4..4e31eaa 100644
--- a/src/BasicRoutingServiceApp.cpp
+++ b/src/BasicRoutingServiceApp.cpp
@@ -500,7 +500,7 @@ void BasicRoutingServiceApp::locateBridgeManager()
     }
     catch(const AsteriskSCF::Core::Discovery::V1::ServiceNotFound&)
     {
-        lg(Debug) << "BridgeManager not found... safe to ignore ServiceNotFound during startup.";
+        lg(Debug) << "BridgeManager not found. (Safe to ignore ServiceNotFound for briding during startup.)";
     }
 
     mSessionContext->bridgeManager = mBridgeManager;
@@ -515,9 +515,16 @@ void BasicRoutingServiceApp::locateStateReplicator()
     replicatorParams->category = BasicRoutingService::V1::StateReplicatorDiscoveryCategory;
     replicatorParams->name = mCommunicator->getProperties()->getPropertyWithDefault(mAppName + ".StateReplicatorName", "default");
 
-    AsteriskSCF::SmartProxy::SmartProxy<RoutingStateReplicatorPrx> replicator(mServiceLocator, replicatorParams, lg);
-
-    mReplicationContext->setReplicatorService(replicator);
+    try
+    {
+        AsteriskSCF::SmartProxy::SmartProxy<RoutingStateReplicatorPrx> replicator(mServiceLocator, replicatorParams, lg);
+        mReplicationContext->setReplicatorService(replicator);
+    }
+    catch(const AsteriskSCF::Core::Discovery::V1::ServiceNotFound&)
+    {
+        lg(Error) << "StateReplicator not found. Check configuration.";
+        throw;
+    }
 }
 
 /**

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


-- 
asterisk-scf/integration/routing.git