Filter results of GetObject
GetObject should only return the services (with their interfaces)
that provide the interface passed in.
Change-Id: I76ca7be85c7f2da4cc66d865a671c27504cb8061
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/src/main.cpp b/src/main.cpp
index a1e6be8..b1fbcbf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -777,6 +777,10 @@
iface->register_method(
"GetObject", [&interface_map](const std::string& path,
std::vector<std::string>& interfaces) {
+ boost::container::flat_map<std::string,
+ boost::container::flat_set<std::string>>
+ results;
+
// Interfaces need to be sorted for intersect to function
std::sort(interfaces.begin(), interfaces.end());
auto path_ref = interface_map.find(path);
@@ -794,12 +798,16 @@
interface_map.second.begin(),
interface_map.second.end()))
{
- return path_ref->second;
+ results.emplace(interface_map.first, interface_map.second);
}
}
- // Unable to find intersection, return default constructed
- // object
- throw NotFoundException();
+
+ if (results.empty())
+ {
+ throw NotFoundException();
+ }
+
+ return results;
});
iface->register_method(