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

[Commits to the Asterisk SCF project code repositories]

branch "basecomponent" has been updated
       via  803f09bd6b3c60ea8ed4f0044476f91817ee0ec2 (commit)
      from  6c92d8677e1ab7dbf5d81d006697a49660d4f693 (commit)

Summary of changes:
 src/Component.cpp |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit 803f09bd6b3c60ea8ed4f0044476f91817ee0ec2
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Jul 20 10:14:15 2011 -0500

    Using simpler registration wrapper interface.

diff --git a/src/Component.cpp b/src/Component.cpp
index 5f1b88c..2b86646 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -198,30 +198,21 @@ void Component::preparePrimaryServicesForDiscovery()
 {
     try
     {
-        std::string serviceName = getCommunicator()->getProperties()->getPropertyWithDefault(
-            getName() + ".Service", "default");
-
         // Wrap our RoutingAdmin interface for the Service Locator.
         mAdminRegistration = wrapServiceForRegistration(mAdminPrx, 
-                                                        RoutingServiceAdminDiscoveryCategory, 
-                                                        serviceName, 
-                                                        getName());
+                                                        RoutingServiceAdminDiscoveryCategory);
         managePrimaryService(mAdminRegistration);
 
 
         // Wrap our RegistryLocator interface for the Service Locator.
         mRegistryLocatorRegistration = wrapServiceForRegistration(mEndpointRegistryPrx,
-                                                                  RoutingServiceLocatorRegistryDiscoveryCategory,
-                                                                  serviceName,
-                                                                  getName());
+                                                                  RoutingServiceLocatorRegistryDiscoveryCategory);
         managePrimaryService(mRegistryLocatorRegistration);
                       
 
         // Wrap the SessionRouter interface for the Service Locator.
         mSessionRouterRegistration = wrapServiceForRegistration(mSessionRouterPrx,
-                                                                SessionRouterDiscoveryCategory,
-                                                                serviceName,
-                                                                getName());
+                                                                SessionRouterDiscoveryCategory);
         managePrimaryService(mSessionRouterRegistration);
     }
     catch(const std::exception& e)

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


-- 
asterisk-scf/integration/routing.git