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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  ab11dc1d69e959ef7966bb359433060723b77c27 (commit)
      from  22e66682ea772f2871bf519a45b4585d45a66d06 (commit)

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


- Log -----------------------------------------------------------------
commit ab11dc1d69e959ef7966bb359433060723b77c27
Author: David M. Lee <dlee at digium.com>
Date:   Fri Feb 24 13:56:36 2012 -0600

    Change prefix name for CollocatedIceStorm.
    
    This was specified by a property, but that extra level of indirection
    makes it really confusing. Plus, the name specified was always the
    service's appName anyways. So just go with that.

diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index 1851327..014805d 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -170,9 +170,7 @@ void ServiceLocatorImpl::locateAll_async(const AMD_ServiceLocator_locateAllPtr&
 void ServiceLocatorApp::start(const string& appName, const Ice::CommunicatorPtr& communicator,
     const Ice::StringSeq&)
 {
-    mIceStorm = new AsteriskSCF::CollocatedIceStorm::CollocatedIceStorm(communicator->getProperties()->getPropertyWithDefault(
-                                                                            appName + ".IceStorm.InstanceName", "ServiceDiscovery"),
-                                                                        communicator->getProperties());
+    mIceStorm = new AsteriskSCF::CollocatedIceStorm::CollocatedIceStorm(appName, communicator->getProperties());
 
     string backplaneAdapterName = appName + ".BackplaneAdapter";
     mLocalAdapter = communicator->createObjectAdapterWithEndpoints(backplaneAdapterName,

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


-- 
asterisk-scf/release/servicediscovery.git