From 13ea662f392298f0f941b66342974f74061fbe25 Mon Sep 17 00:00:00 2001 From: coderhyme Date: Sun, 14 Feb 2016 21:00:51 -0800 Subject: [PATCH] Fixed a bug regarding the batch interface in RCSResourceObject. There was a problem that RCSResourceObject didn't handle the batch interface. The response format also was wrong. Change-Id: I9e55779ceec70fcb7d7140f5b21e03107e65e56b Signed-off-by: coderhyme Reviewed-on: https://gerrit.iotivity.org/gerrit/4997 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka Reviewed-by: Uze Choi --- .../src/serverBuilder/src/RCSResourceObject.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp b/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp index feb2068..b93780b 100644 --- a/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp +++ b/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp @@ -59,7 +59,11 @@ namespace inline bool requestContainsInterface(const std::shared_ptr< OC::OCResourceRequest >& request, const std::string& interface) { - return request->getQueryParameters().find(interface) != request->getQueryParameters().end(); + auto it = request->getQueryParameters().find(OC::Key::INTERFACESKEY); + + if (it == request->getQueryParameters().end()) return false; + + return it->second == interface; } OCEntityHandlerResult sendResponse(const std::shared_ptr< OC::OCResourceRequest >& ocRequest, @@ -140,7 +144,7 @@ namespace const std::shared_ptr< OC::OCResourceRequest >& request, const RCSResourceObject* resourceObject) { - auto rcsRep = resourceObject->toRepresentation(); + RCSRepresentation rcsRep; for (const auto& bound : resourceObject->getBoundResources()) { -- 2.7.4