Imported Upstream version 0.9.1

[platform/upstream/iotivity.git] / resource / examples / roomserver.cpp

diff --git a/resource/examples/roomserver.cpp b/resource/examples/roomserver.cpp
index 25c7ee9..7768b3f 100644 (file)
--- a/resource/examples/roomserver.cpp
+++ b/resource/examples/roomserver.cpp
@@ -74,8 +74,9 @@ public:
 
 public:
     /// Constructor
-    RoomResource(): m_roomName("John's Room"), m_lightState(false),
-                    m_lightColor(0), m_fanState(false), m_fanSpeed(0)
+    RoomResource(): m_roomName("John's Room"), m_roomHandle(nullptr), m_lightState(false),
+                    m_lightColor(0),m_lightHandle(nullptr),  m_fanState(false), m_fanSpeed(0),
+                    m_fanHandle(nullptr)
     {
         m_lightUri = "/a/light"; // URI of the resource
         m_lightTypes.push_back("core.light"); // resource type name. In this case, it is light
@@ -289,13 +290,7 @@ bool prepareLightResponse(std::shared_ptr<OCResourceRequest> request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if(requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-        else if(requestFlag == RequestHandlerFlag::RequestFlag)
+        if(requestFlag == RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";
 
@@ -350,13 +345,7 @@ bool prepareFanResponse(std::shared_ptr<OCResourceRequest> request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if(requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-        else if(requestFlag == RequestHandlerFlag::RequestFlag)
+        if(requestFlag == RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";
 
@@ -411,13 +400,7 @@ OCEntityHandlerResult entityHandlerRoom(std::shared_ptr<OCResourceRequest> reque
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if(requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-        else if(requestFlag == RequestHandlerFlag::RequestFlag)
+        if(requestFlag == RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";
 
@@ -592,7 +575,7 @@ int main(int argc, char* argv[])
         cv.wait(lock);
 
     }
-    catch(OCException e)
+    catch(OCException &e)
     {
         std::cout << "Exception in main: " << e.what();
     }
@@ -602,3 +585,4 @@ int main(int argc, char* argv[])
 
     return 0;
 }
+