From: coderhyme <jhyo.kim@samsung.com>
Date: Mon, 15 Feb 2016 05:00:51 +0000 (-0800)
Subject: Fixed a bug regarding the batch interface in RCSResourceObject.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13ea662f392298f0f941b66342974f74061fbe25;p=contrib%2Fiotivity.git

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 <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4997
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
---

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())
         {