From: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Date: Wed, 23 Nov 2016 08:51:41 +0000 (+0900)
Subject: [IOT-1592] Fix rd publish fail
X-Git-Tag: 1.3.0~1052^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6911f6be4fbfd2d32426348e8f84c450d9f591c;p=platform%2Fupstream%2Fiotivity.git

[IOT-1592] Fix rd publish fail

1. RD publish fail due to lack of shared point lock logic.

https://jira.iotivity.org/browse/IOT-1592

Change-Id: I278b67ac050fb5bcb0cb5ee6920c27e446f0f01a
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14647
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit d1abd0caaa69ba0f4346ecd8958e4fb4363ae239)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14711
---

diff --git a/resource/csdk/resource-directory/include/RDClient.h b/resource/csdk/resource-directory/include/RDClient.h
index 288e985..2f48e01 100644
--- a/resource/csdk/resource-directory/include/RDClient.h
+++ b/resource/csdk/resource-directory/include/RDClient.h
@@ -46,9 +46,15 @@ class RDClient
 {
 private:
     OCQualityOfService m_qos;
+    std::shared_ptr<std::recursive_mutex> _csdkLock;
+    std::weak_ptr<std::recursive_mutex> m_csdkLock;
+
 public:
-    RDClient(OCQualityOfService qos = OC_NA_QOS) : m_qos(qos)
+    RDClient(OCQualityOfService qos = OC_NA_QOS)
+        : m_qos(qos),
+        _csdkLock{ std::make_shared<std::recursive_mutex>() }
     {
+        m_csdkLock = _csdkLock;
     }
 
     static RDClient& Instance()
diff --git a/resource/csdk/resource-directory/src/RDClient.cpp b/resource/csdk/resource-directory/src/RDClient.cpp
index 365ab5d..115c451 100644
--- a/resource/csdk/resource-directory/src/RDClient.cpp
+++ b/resource/csdk/resource-directory/src/RDClient.cpp
@@ -33,8 +33,6 @@
 #include "OCException.h"
 #include "ocpayload.h"
 
-std::weak_ptr<std::recursive_mutex> m_csdkLock;
-
 using namespace OC;