Add destructor to PrimitiveServerResource to unregister resource automatically

Change-Id: I31814a6c720154bdbd2eebeb20c9b3204af89940
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1307
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/basis/serverBuilder/include/PrimitiveServerResource.h b/service/basis/serverBuilder/include/PrimitiveServerResource.h
index 87e3a0d..d537b54 100644 (file)
--- a/service/basis/serverBuilder/include/PrimitiveServerResource.h
+++ b/service/basis/serverBuilder/include/PrimitiveServerResource.h
@@ -108,6 +108,8 @@ namespace OIC
             PrimitiveServerResource& operator=(PrimitiveServerResource&&) = delete;
             PrimitiveServerResource& operator=(const PrimitiveServerResource&) = delete;
 
+            ~PrimitiveServerResource();
+
             template< typename T >
             void setAttribute(const std::string& key, const T &value)
             {

diff --git a/service/basis/serverBuilder/src/PrimitiveServerResource.cpp b/service/basis/serverBuilder/src/PrimitiveServerResource.cpp
index 3fa0ae0..dc43b3b 100644 (file)
--- a/service/basis/serverBuilder/src/PrimitiveServerResource.cpp
+++ b/service/basis/serverBuilder/src/PrimitiveServerResource.cpp
@@ -158,6 +158,21 @@ namespace OIC
             return server;
         }
 
+
+        PrimitiveServerResource::~PrimitiveServerResource()
+        {
+            if (m_resourceHandle)
+            {
+                try
+                {
+                    OC::OCPlatform::unregisterResource(m_resourceHandle);
+                }
+                catch (...)
+                {
+                }
+            }
+        }
+
         bool PrimitiveServerResource::hasAttribute(const std::string& key) const
         {
             WeakGuard lock(*this);