Fix PresenceSubscriber to work correctly with move constructor

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

diff --git a/service/basis/common/primitiveResource/include/PresenceSubscriber.h b/service/basis/common/primitiveResource/include/PresenceSubscriber.h
index 93ba659..121f760 100644 (file)
--- a/service/basis/common/primitiveResource/include/PresenceSubscriber.h
+++ b/service/basis/common/primitiveResource/include/PresenceSubscriber.h
@@ -33,7 +33,7 @@ class PresenceSubscriber
 public:
     PresenceSubscriber();
 
-    PresenceSubscriber(PresenceSubscriber&&) = default;
+    PresenceSubscriber(PresenceSubscriber&&);
 
     /**
      * @throw PlatformException
@@ -49,7 +49,7 @@ public:
 
     ~PresenceSubscriber();
 
-    PresenceSubscriber& operator=(PresenceSubscriber&&) = default;
+    PresenceSubscriber& operator=(PresenceSubscriber&&);
 
     /**
      * @throw PlatformException

diff --git a/service/basis/common/primitiveResource/src/PresenceSubscriber.cpp b/service/basis/common/primitiveResource/src/PresenceSubscriber.cpp
index 19eb996..58e9f8c 100644 (file)
--- a/service/basis/common/primitiveResource/src/PresenceSubscriber.cpp
+++ b/service/basis/common/primitiveResource/src/PresenceSubscriber.cpp
@@ -64,6 +64,12 @@ PresenceSubscriber::PresenceSubscriber() :
 {
 }
 
+PresenceSubscriber::PresenceSubscriber(PresenceSubscriber&& from) :
+    m_handle{ nullptr }
+{
+    std::swap(m_handle, from.m_handle);
+}
+
 PresenceSubscriber::PresenceSubscriber(const std::string& host,
         OCConnectivityType connectivityType, SubscribeCallback presenceHandler) :
         m_handle{ nullptr }
@@ -92,6 +98,13 @@ PresenceSubscriber::~PresenceSubscriber()
     }
 }
 
+PresenceSubscriber& PresenceSubscriber::operator=(PresenceSubscriber&& from)
+{
+    unsubscribe();
+    std::swap(m_handle, from.m_handle);
+    return *this;
+}
+
 void PresenceSubscriber::unsubscribe()
 {
     if (m_handle == nullptr) return;