Imported Upstream version 0.9.1

[platform/upstream/iotivity.git] / service / soft-sensor-manager / SSMCore / src / SSMInterface / SSMResourceServer.cpp

diff --git a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.cpp b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.cpp
index de15320..d11b427 100644 (file)
--- a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.cpp
+++ b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.cpp
@@ -17,7 +17,6 @@
  * limitations under the License.
  *
  ******************************************************************/
-
 #include "SSMResourceServer.h"
 #include "SSMCore.h"
 #include "Common/PlatformLayer.h"
@@ -40,7 +39,7 @@ class CQueryEngineEvent: public IQueryEngineEvent
             m_hSSMResource = resourceHandle;
         }
 
-        SSMRESULT onQueryEngineEvent(IN int cqid, IN IDataReader *pResult)
+        SSMRESULT onQueryEngineEvent(int cqid, IDataReader *pResult)
         {
             int dataCount = 0;
             IModelData *pModelData = NULL;
@@ -109,7 +108,8 @@ class CQueryEngineEvent: public IQueryEngineEvent
             g_vecQueryEventResults.push_back(queryEventResult);
 
             //TODO: need to modify for notifying proper clients
-            OCPlatform::notifyAllObservers(m_hSSMResource);
+            if (OCPlatform::notifyAllObservers(m_hSSMResource) != OC_STACK_OK)
+                return SSM_E_FAIL;
 
             return SSM_S_OK;
         }
@@ -195,15 +195,8 @@ OCEntityHandlerResult SSMResourceServer::entityHandler(std::shared_ptr< OCResour
         response->setRequestHandle(request->getRequestHandle());
         response->setResourceHandle(request->getResourceHandle());
 
-        if (requestFlag & RequestHandlerFlag::InitFlag)
-        {
-            // entity handler to perform resource initialization operations
-        }
-
         if (requestFlag & RequestHandlerFlag::RequestFlag)
         {
-            cout << "\t\trequestFlag : Request\n";
-
             // If the request type is GET
             if (requestType == "GET")
             {
@@ -274,7 +267,7 @@ OCEntityHandlerResult SSMResourceServer::entityHandler(std::shared_ptr< OCResour
                 }
                 else if (rep.getValue<std::string>("command") == "ReleaseQueryEngine")
                 {
-                    pQueryEngine = (IQueryEngine *) std::stoi(
+                    pQueryEngine = (IQueryEngine *) std::stoll(
                                        rep.getValue<std::string>("queryEngineId"));
 
                     ReleaseQueryEngine(pQueryEngine);
@@ -283,7 +276,7 @@ OCEntityHandlerResult SSMResourceServer::entityHandler(std::shared_ptr< OCResour
                 {
                     int CQID = 0;
 
-                    pQueryEngine = (IQueryEngine *) std::stoi(
+                    pQueryEngine = (IQueryEngine *)std::stoll(
                                        rep.getValue<std::string>("queryEngineId"));
 
                     res = pQueryEngine->executeContextQuery(
@@ -301,7 +294,7 @@ OCEntityHandlerResult SSMResourceServer::entityHandler(std::shared_ptr< OCResour
                 }
                 else if (rep.getValue<std::string>("command") == "KillContextQuery")
                 {
-                    pQueryEngine = (IQueryEngine *) std::stoi(
+                    pQueryEngine = (IQueryEngine *)std::stoll(
                                        rep.getValue<std::string>("queryEngineId"));
 
                     res = pQueryEngine->killContextQuery(std::stoi(rep.getValue<std::string>("CQID")));