commit 17064022f31ddf668c8a1840452f6e3cf99e27ea
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Oct 07 18:34:44 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Oct 07 18:34:44 2020 -0700
tree 30f0c35c83982805f96fdce313d2514c2b183eda
parent 8683ec92bcb017583f83d15d8f4c3da30d854007

fix some errors in tests

Change-Id: I8f160bd9f555cac5999765e0fcb83fa78c9feffe

src/configuration.cpp

diff --git a/src/configuration.cpp b/src/configuration.cpp
index 60097a6..0117df7 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -153,12 +153,11 @@
   auto nameAssignmentItems = configJson.get_child_optional(CONFIG_NAME_ASSIGNMENT);
   if (nameAssignmentItems) {
     for (const auto item : *nameAssignmentItems) {
-      try {
-        m_heuristic.push_back(NameAssignmentFuncFactory::createNameAssignmentFuncFactory(item.first));
-      }
-      catch (const std::exception& e) {
+      auto func = NameAssignmentFuncFactory::createNameAssignmentFuncFactory(item.first, item.second.data());
+      if (func == nullptr) {
         BOOST_THROW_EXCEPTION(std::runtime_error("Error on creating name assignment function"));
       }
+      m_heuristic.push_back(std::move(func));
     }
   }
 }