Fixed bug while merging iotcon discovery results

Change-Id: Iecc5e33251f78d2b5c611e6935c35ba9a007846a
Signed-off-by: kmook <kmook.choi@samsung.com>

diff --git a/daemon/DiscoveryManager.cpp b/daemon/DiscoveryManager.cpp
index 9f94ee2..e4fb71c 100755 (executable)
--- a/daemon/DiscoveryManager.cpp
+++ b/daemon/DiscoveryManager.cpp
@@ -374,6 +374,9 @@ int conv::DiscoveryManager::appendDiscoveredResult(conv::IDevice* discoveredDevi
                _D("update discovered device's info [%s]", discoveredDevice->getId().c_str());
                IDevice* currentDevice = iterDiscovered->second;
 
+               if (currentDevice->getAddress().empty() && !discoveredDevice->getAddress().empty())
+                       currentDevice->setAddress(discoveredDevice->getAddress());
+
                int countNewServices = mergeExcludeServices(currentDevice, discoveredDevice);
                if (countNewServices == 0)
                        return CONV_ERROR_NONE;

diff --git a/daemon/IDevice.h b/daemon/IDevice.h
index b933557..30dac5f 100644 (file)
--- a/daemon/IDevice.h
+++ b/daemon/IDevice.h
@@ -34,6 +34,7 @@ namespace conv {
                        virtual string getName() = 0;
                        virtual string getId() = 0;
                        virtual string getAddress() = 0;
+                       virtual int setAddress(std::string host_address) = 0;
        };
 }
 

diff --git a/daemon/discovery_provider/iotcon/DeviceAdapter.cpp b/daemon/discovery_provider/iotcon/DeviceAdapter.cpp
index 78b5ef2..f701a7b 100755 (executable)
--- a/daemon/discovery_provider/iotcon/DeviceAdapter.cpp
+++ b/daemon/discovery_provider/iotcon/DeviceAdapter.cpp
@@ -81,3 +81,9 @@ int conv::DeviceAdapter::getServiceList(std::list<IService*> *list)
        }
        return CONV_ERROR_NONE;
 }
+
+int conv::DeviceAdapter::setAddress(string id)
+{
+       m_resource_h.setHostAddress(id);
+       return CONV_ERROR_NONE;
+}

diff --git a/daemon/discovery_provider/iotcon/DeviceAdapter.h b/daemon/discovery_provider/iotcon/DeviceAdapter.h
index 035a6bd..fcf599e 100644 (file)
--- a/daemon/discovery_provider/iotcon/DeviceAdapter.h
+++ b/daemon/discovery_provider/iotcon/DeviceAdapter.h
@@ -35,6 +35,7 @@ namespace conv {
                        string getName();
                        string getId();
                        string getAddress();
+                       int setAddress(std::string host_address);
 
                private :
                        ResourceHandle  m_resource_h;