X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fresource-encapsulation%2Fsrc%2FresourceClient%2FRCSDiscoveryManager.cpp;h=007d49cbd48827cd0da70c276a9c0b7794546cc0;hb=f1b10862b39077d84b15ba22855b7e9de07e37a5;hp=6fbeb73cac996d663bc7a90b8a030aa7102aa3f6;hpb=8666548d3b7e82073fe14f28ce684d5c46c28bd6;p=platform%2Fupstream%2Fiotivity.git diff --git a/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp b/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp index 6fbeb73..007d49c 100755 --- a/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp +++ b/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp @@ -83,10 +83,8 @@ namespace OIC const RCSAddress& address, const std::string& relativeUri, const std::string& resourceType, ResourceDiscoveredCallback cb) { - return discoverResourceByTypes(address, - relativeUri.empty() ? OC_RSRVD_WELL_KNOWN_URI : relativeUri, - std::vector< std::string > - { resourceType }, std::move(cb)); + return discoverResourceByTypes(address, relativeUri, + std::vector< std::string >{ resourceType }, std::move(cb)); } RCSDiscoveryManager::DiscoveryTask::Ptr RCSDiscoveryManager::discoverResourceByTypes( @@ -94,7 +92,9 @@ namespace OIC const std::vector< std::string >& resourceTypes, ResourceDiscoveredCallback cb) { return RCSDiscoveryManagerImpl::getInstance()->startDiscovery(address, - relativeUri.empty() ? OC_RSRVD_WELL_KNOWN_URI : relativeUri, resourceTypes, + relativeUri.empty() ? OC_RSRVD_WELL_KNOWN_URI : relativeUri, + resourceTypes.empty() ? std::vector< std::string >{ + RCSDiscoveryManagerImpl::ALL_RESOURCE_TYPE } : resourceTypes, std::move(cb)); } }