Update snapshot(2017-12-14)

[platform/upstream/iotivity.git] / service / resource-encapsulation / src / serverBuilder / src / RCSResourceObject.cpp

diff --git a/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp b/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
index 80afefb..cecfb1d 100644 (file)
--- a/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
+++ b/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
@@ -34,6 +34,9 @@
 #include "logger.h"
 #include "OCPlatform.h"
 
+#ifdef  LOG_TAG
+#undef  LOG_TAG
+#endif
 #define LOG_TAG "RCSResourceObject"
 
 namespace
@@ -88,7 +91,7 @@ namespace
     RESPONSE invokeHandler(RCSResourceAttributes& attrs, const RCSRequest& request,
             std::shared_ptr< HANDLER > handler)
     {
-        if (handler)
+        if (handler && *handler)
         {
             return (*handler)(request, attrs);
         }
@@ -138,8 +141,8 @@ namespace OIC
     namespace Service
     {
 
-        RCSResourceObject::Builder::Builder(std::string &&uri, std::string &&type,
-                std::string &&interface) :
+        RCSResourceObject::Builder::Builder(std::string uri, std::string type,
+                std::string interface) :
                 m_uri{ std::move(uri) },
                 m_types{ std::move(type) },
                 m_interfaces{ },
@@ -156,17 +159,6 @@ namespace OIC
             }
         }
 
-        RCSResourceObject::Builder::Builder(const std::string &uri, const std::string &type,
-                const std::string &interface) :
-                m_uri{ uri },
-                m_types{ type },
-                m_interfaces{ interface },
-                m_defaultInterface { BASELINE_INTERFACE },
-                m_properties{ OC_DISCOVERABLE | OC_OBSERVABLE },
-                m_resourceAttributes{ }
-        {
-        }
-
         RCSResourceObject::Builder& RCSResourceObject::Builder::addInterface(std::string interface)
         {
             insertValue(m_interfaces, std::move(interface));
@@ -826,7 +818,7 @@ namespace OIC
                     m_resourceObject, m_resourceObject.m_resourceAttributes, m_autoNotifyPolicy);
         }
 
-        RCSResourceObject::WeakGuard::WeakGuard(
+      RCSResourceObject::WeakGuard::WeakGuard(
                 const RCSResourceObject& resourceObject) :
                 m_isOwningLock{ false },
                 m_resourceObject(resourceObject)