projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update snapshot(2018-02-07)
[platform/upstream/iotivity.git]
/
service
/
resource-encapsulation
/
src
/
resourceCache
/
src
/
ResourceCacheManager.cpp
diff --git
a/service/resource-encapsulation/src/resourceCache/src/ResourceCacheManager.cpp
b/service/resource-encapsulation/src/resourceCache/src/ResourceCacheManager.cpp
index
e572575
..
8a3f020
100644
(file)
--- a/
service/resource-encapsulation/src/resourceCache/src/ResourceCacheManager.cpp
+++ b/
service/resource-encapsulation/src/resourceCache/src/ResourceCacheManager.cpp
@@
-88,7
+88,6
@@
namespace OIC
auto newHandler = std::make_shared<ObserveCache>(pResource);
newHandler->startCache(std::move(func));
auto newHandler = std::make_shared<ObserveCache>(pResource);
newHandler->startCache(std::move(func));
- m_observeCacheList.push_back(newHandler);
observeCacheIDmap.insert(std::make_pair(retID, newHandler));
return retID;
observeCacheIDmap.insert(std::make_pair(retID, newHandler));
return retID;
@@
-134,7
+133,6
@@
namespace OIC
if ((dataCacheIns == cacheIDmap.end() && observeIns == observeCacheIDmap.end())
|| id == 0)
{
if ((dataCacheIns == cacheIDmap.end() && observeIns == observeCacheIDmap.end())
|| id == 0)
{
- lock.~lock_guard();
throw RCSInvalidParameterException {"[cancelResourceCache] CacheID is invaild"};
}
throw RCSInvalidParameterException {"[cancelResourceCache] CacheID is invaild"};
}
@@
-147,12
+145,11
@@
namespace OIC
catch (...)
{
(observeIns->second).reset();
catch (...)
{
(observeIns->second).reset();
- observeCacheIDmap.erase(observeIns);
- lock.~lock_guard();
+ observeCacheIDmap.erase(id);
throw;
}
(observeIns->second).reset();
throw;
}
(observeIns->second).reset();
- observeCacheIDmap.erase(
observeIns
);
+ observeCacheIDmap.erase(
id
);
return;
}
return;
}
@@
-177,13
+174,13
@@
namespace OIC
if (updateId == 0)
{
if (updateId == 0)
{
- throw RCSInvalidParameterException {"[
getCachedData
] CacheID is NULL"};
+ throw RCSInvalidParameterException {"[
updateResourceCache
] CacheID is NULL"};
}
DataCachePtr foundCache = findDataCache(updateId);
if (foundCache == nullptr)
{
}
DataCachePtr foundCache = findDataCache(updateId);
if (foundCache == nullptr)
{
- throw RCSInvalidParameterException {"[
getCachedData
] CacheID is invaild"};
+ throw RCSInvalidParameterException {"[
updateResourceCache
] CacheID is invaild"};
}
foundCache->requestGet();
}
}
foundCache->requestGet();
}