Merge branch 'master' into easysetup

[platform/upstream/iotivity.git] / resource / src / OCResourceRequest.cpp

diff --git a/resource/src/OCResourceRequest.cpp b/resource/src/OCResourceRequest.cpp
index e5850fb..d600017 100644 (file)
--- a/resource/src/OCResourceRequest.cpp
+++ b/resource/src/OCResourceRequest.cpp
@@ -30,7 +30,11 @@ void OCResourceRequest::setPayload(OCPayload* payload)
 {
     MessageContainer info;
 
-    if(payload == nullptr || payload->type != PAYLOAD_TYPE_REPRESENTATION)
+    if(payload == nullptr)
+    {
+        return;
+    }
+    if(payload->type != PAYLOAD_TYPE_REPRESENTATION)
     {
         throw std::logic_error("Wrong payload type");
         return;