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

[Commits to the Asterisk SCF project code repositories]

branch "operation-context-propagation" has been updated
       via  3e25441cf884312f58eef06779a3a2364173d1c7 (commit)
      from  596b2bc7cd7435647a2d6197223cb189b21290b3 (commit)

Summary of changes:
 src/Helpers/OperationContextCache.cpp              |    9 +++++----
 .../LocatorRegistrationTest.cpp                    |   10 ++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 3e25441cf884312f58eef06779a3a2364173d1c7
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Feb 3 11:41:26 2012 -0330

    Let's try that again.. conflicts really resolved this time + some
    build fixes for out of order member initialization, etc.

diff --git a/src/Helpers/OperationContextCache.cpp b/src/Helpers/OperationContextCache.cpp
index 888fc63..ce34fad 100644
--- a/src/Helpers/OperationContextCache.cpp
+++ b/src/Helpers/OperationContextCache.cpp
@@ -106,9 +106,10 @@ OperationContextCache::OperationContextCache(int ttlSeconds)
     : mLogger(lg),
       mLoggingEnabled(false),
       mLoggingLabel(""),
-      mTTL(IceUtil::Time::seconds(ttlSeconds)),
+      mTimerTask(new OperationContextPruner(this)),
       mTimer(new IceUtil::Timer),
-      mTimerTask(new OperationContextPruner(this))
+      mTTL(IceUtil::Time::seconds(ttlSeconds))
+
 {
     mTimer->scheduleRepeated(mTimerTask, mTTL);
 }
@@ -127,9 +128,9 @@ OperationContextCache::OperationContextCache(int ttlSeconds,
     : mLogger(logger),
       mLoggingEnabled(true),
       mLoggingLabel(label),
-      mTTL(IceUtil::Time::seconds(ttlSeconds)),
+      mTimerTask(new OperationContextPruner(this)),
       mTimer(new IceUtil::Timer),
-      mTimerTask(new OperationContextPruner(this))
+      mTTL(IceUtil::Time::seconds(ttlSeconds))
 {
     mTimer->scheduleRepeated(mTimerTask, mTTL);
 }
diff --git a/test/LocatorRegistration/LocatorRegistrationTest.cpp b/test/LocatorRegistration/LocatorRegistrationTest.cpp
index 925324a..99df3fa 100644
--- a/test/LocatorRegistration/LocatorRegistrationTest.cpp
+++ b/test/LocatorRegistration/LocatorRegistrationTest.cpp
@@ -185,6 +185,12 @@ public:
         }
     }
 
+    AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsSeq getLocatorParams(const Ice::Current&)
+    {
+        statePreCheck();
+        return AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsSeq();
+    }
+
 private:
     IceUtil::Handle<RegistrationData> mData;
 };
@@ -477,11 +483,7 @@ public:
             mMgrToken = mManager->addService(mManager, mMgrTokenUUID);
             AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr params(new AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams);
             params->category = "AsteriskSCF.LocatorManager";
-<<<<<<< HEAD
             mMgrToken->addLocatorParams(AsteriskSCF::createContext(), params, "");
-=======
-            mMgrToken->addLocatorParams(new OperationContext(IceUtil::generateUUID()), params, "");
->>>>>>> dev/retry_deux
         }
     }
 

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


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