[asterisk-scf-commits] asterisk-scf/integration/ice-util-cpp.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  93daa487b3f21b9bb78172961cabd602c537f474 (commit)
      from  62e32bc965e3140af78987d00dccbc54e08e8903 (commit)

Summary of changes:
 .../AsteriskSCF/Operations/OperationContextCache.h |    4 ++++
 src/Component/ComponentStateReplicator.cpp         |   14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 93daa487b3f21b9bb78172961cabd602c537f474
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Mar 16 11:15:14 2012 -0230

    Add missing OperationContext's in method signatures and calls.

diff --git a/include/AsteriskSCF/Operations/OperationContextCache.h b/include/AsteriskSCF/Operations/OperationContextCache.h
index e1b5388..c9a41d9 100644
--- a/include/AsteriskSCF/Operations/OperationContextCache.h
+++ b/include/AsteriskSCF/Operations/OperationContextCache.h
@@ -126,6 +126,10 @@ public:
     std::size_t size();
 
 private:
+
+    //
+    // TODO: why not make these protected and permit derivation?
+    //
     OperationContextCache(int ttlSeconds);
 
     OperationContextCache(int ttlSeconds, 
diff --git a/src/Component/ComponentStateReplicator.cpp b/src/Component/ComponentStateReplicator.cpp
index 2b8686e..a8b129c 100644
--- a/src/Component/ComponentStateReplicator.cpp
+++ b/src/Component/ComponentStateReplicator.cpp
@@ -55,12 +55,16 @@ class ConfigurationReplicatorImpl : public ConfigurationReplicator
 {
 public:
     ConfigurationReplicatorImpl(const IceStorm::TopicPrx& topic) : mConfigurationReplicationTopic(topic) { };
-    void registerConfigurationService(const AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx&, const Ice::Current&);
+    void registerConfigurationService(
+        const AsteriskSCF::System::V1::OperationContextPtr&,
+        const AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx&, const Ice::Current&);
 private:
     IceStorm::TopicPrx mConfigurationReplicationTopic;
 };
 
-void ConfigurationReplicatorImpl::registerConfigurationService(const AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx& service, const Ice::Current&)
+void ConfigurationReplicatorImpl::registerConfigurationService(
+    const AsteriskSCF::System::V1::OperationContextPtr&,
+    const AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx& service, const Ice::Current&)
 {
     if (mConfigurationReplicationTopic)
     {
@@ -195,14 +199,16 @@ void ComponentStateReplicator::onPreServiceCreation()
 
         // Publish the configuration service IceStorm topic so everybody gets configuration
         mConfigurationManagement = ServiceManagementPrx::uncheckedCast(
-            getServiceLocatorManagement()->addService(mConfigurationPublisher, ""));
+            getServiceLocatorManagement()->addService(AsteriskSCF::Operations::createContext(), 
+            mConfigurationPublisher, ""));
 
         ServiceLocatorParamsPtr configurationParams = new ServiceLocatorParams();
         configurationParams->category = mConfigurationDiscoveryCategory;
         configurationParams->service = getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".ServiceName", 
             "default");
         configurationParams->id = getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".Name", "");
-        mConfigurationManagement->addLocatorParams(configurationParams, "");
+        mConfigurationManagement->addLocatorParams(AsteriskSCF::Operations::createContext(),
+            configurationParams, "");
     }
 }
 

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


-- 
asterisk-scf/integration/ice-util-cpp.git