projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.1.0
[platform/upstream/iotivity.git]
/
service
/
resource-container
/
unittests
/
ResourceContainerTestSimulator.h
diff --git
a/service/resource-container/unittests/ResourceContainerTestSimulator.h
b/service/resource-container/unittests/ResourceContainerTestSimulator.h
index
4d2cf9f
..
40d1370
100644
(file)
--- a/
service/resource-container/unittests/ResourceContainerTestSimulator.h
+++ b/
service/resource-container/unittests/ResourceContainerTestSimulator.h
@@
-66,13
+66,20
@@
class ResourceContainerTestSimulator
~ResourceContainerTestSimulator()
{
~ResourceContainerTestSimulator()
{
- if (remoteResource != nullptr && remoteResource->isCaching())
+ try
{
{
- remoteResource->stopCaching();
+ if (remoteResource != nullptr && remoteResource->isCaching())
+ {
+ remoteResource->stopCaching();
+ }
+ if (remoteResource != nullptr && remoteResource->isMonitoring())
+ {
+ remoteResource->stopMonitoring();
+ }
}
}
-
if (remoteResource != nullptr && remoteResource->isMonitoring()
)
+
catch (RCSException &e
)
{
{
-
remoteResource->stopMonitoring()
;
+
std::cout << "exception : " << e.what() << std::endl
;
}
}
}
}
@@
-150,7
+157,7
@@
class ResourceContainerTestSimulator
std::weak_ptr<ResourceContainerTestSimulator>(shared_from_this())));
mutexForDiscovery.lock();
}
std::weak_ptr<ResourceContainerTestSimulator>(shared_from_this())));
mutexForDiscovery.lock();
}
- catch (
std::e
xception &e)
+ catch (
RCSInvalidParameterE
xception &e)
{
std::cout << "exception : " << e.what() << std::endl;
}
{
std::cout << "exception : " << e.what() << std::endl;
}