commit 77c8751576bc5765aa570be219c26a243486bf11
author Steve DiBenedetto <dibenede@cs.colostate.edu> Mon Oct 06 14:18:22 2014 -0600
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Wed Oct 08 11:53:53 2014 -0700
tree 1dd883a8f8081ed6c18f16c9136259186d5003c2
parent b4336c2e0a2da8482cb990e892662bb7fef8437a

mgmt: update strategy-choice/set to return a versioned strategy name

refs: #1972

Change-Id: I1616574a4643884dac050d240b771423ec2a0846

daemon/mgmt/strategy-choice-manager.cpp

diff --git a/daemon/mgmt/strategy-choice-manager.cpp b/daemon/mgmt/strategy-choice-manager.cpp
index 1193900..962349d 100644
--- a/daemon/mgmt/strategy-choice-manager.cpp
+++ b/daemon/mgmt/strategy-choice-manager.cpp
@@ -162,6 +162,7 @@
   if (m_strategyChoice.insert(prefix, selectedStrategy))
     {
       NFD_LOG_DEBUG("strategy-choice result: SUCCESS");
+      parameters.setStrategy(*m_strategyChoice.get(prefix));
       setResponse(response, 200, "Success", parameters.wireEncode());
     }
   else

daemon/table/strategy-choice.cpp

diff --git a/daemon/table/strategy-choice.cpp b/daemon/table/strategy-choice.cpp
index 6500191..eedbc91 100644
--- a/daemon/table/strategy-choice.cpp
+++ b/daemon/table/strategy-choice.cpp
@@ -158,7 +158,7 @@
     return shared_ptr<const Name>();
   }
 
-  return entry->getStrategy().getName().shared_from_this();
+  return make_shared<const Name>(entry->getStrategy().getName());
 }
 
 static inline bool