fix all test failures
Change-Id: Ia046734dca015f2ef99b23562f0b88c8f51e82af
diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 2c82f67..7b806b7 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -163,16 +163,13 @@
// process PROBE requests: collect probe parameters
auto parameters = PROBE::decodeApplicationParameters(request.getApplicationParameters());
std::vector<PartialName> availableComponents;
- try {
for (auto& item : m_config.m_heuristic) {
auto names = item->assignName(parameters);
availableComponents.insert(availableComponents.end(), names.begin(), names.end());
}
- }
- catch (const std::exception& e) {
- _LOG_TRACE("Cannot parse probe parameters: " << e.what());
+ if (availableComponents.size() == 0) {
m_face.put(generateErrorDataPacket(request.getName(), ErrorCode::INVALID_PARAMETER,
- "Cannot parse probe parameters: " + std::string(e.what())));
+ "Cannot generate available names from parameters provided."));
return;
}
std::vector<Name> availableNames;
diff --git a/src/name-assignments/assignment-param.cpp b/src/name-assignments/assignment-param.cpp
index 56da436..890af34 100644
--- a/src/name-assignments/assignment-param.cpp
+++ b/src/name-assignments/assignment-param.cpp
@@ -21,7 +21,7 @@
for (const auto& item : m_nameFormat) {
auto it = std::find_if(params.begin(), params.end(),
[&](const std::tuple<std::string, std::string>& e) { return std::get<0>(e) == item; });
- if (it != params.end()) {
+ if (it != params.end() && !std::get<1>(*it).empty()) {
result.append(std::get<1>(*it));
}
else {