//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#include "RemoteResourceUnit.h"
+#include "InternalTypes.h"
+
+#include <exception>
using namespace OIC::Service;
pStateChangedCB = std::bind(&RemoteResourceUnit::stateChangedCB, this,
std::placeholders::_1);
pCacheUpdateCB = std::bind(&RemoteResourceUnit::cacheUpdateCB, this,
- std::placeholders::_1);
+ std::placeholders::_1, std::placeholders::_2);
}
RemoteResourceUnit::~RemoteResourceUnit()
{
if(remoteObject->isCaching())
{
- remoteObject->stopCaching();
+ try
+ {
+ remoteObject->stopCaching();
+ }
+ catch(std::exception &e)
+ {
+ OIC_LOG_V(ERROR, CONTAINER_TAG, "%s", e.what());
+ }
}
if(remoteObject->isMonitoring())
{
- remoteObject->stopMonitoring();
+ try
+ {
+ remoteObject->stopMonitoring();
+ }
+ catch(std::exception &e)
+ {
+ OIC_LOG_V(ERROR, CONTAINER_TAG, "%s", e.what());
+ }
}
}
}
return retRemoteResourceUnit;
}
-RemoteResourceUnit::Ptr RemoteResourceUnit::createRemoteResourceInfoWithStateCB(
- RCSRemoteResourceObject::Ptr ptr, UpdatedCBFromServer updatedCB,
- RCSRemoteResourceObject::StateChangedCallback stateCB)
-{
- RemoteResourceUnit::Ptr retRemoteResourceUnit = std::make_shared<RemoteResourceUnit>();
- retRemoteResourceUnit->remoteObject = ptr;
- retRemoteResourceUnit->pUpdatedCB = updatedCB;
-
- retRemoteResourceUnit->pStateChangedCB = stateCB;
-
- return retRemoteResourceUnit;
-}
-
RemoteResourceUnit::Ptr RemoteResourceUnit::createRemoteResourceInfoWithCacheCB(
RCSRemoteResourceObject::Ptr ptr, UpdatedCBFromServer updatedCB,
RCSRemoteResourceObject::CacheUpdatedCallback cacheCB)
}
}
-void RemoteResourceUnit::cacheUpdateCB(const RCSResourceAttributes & updatedAtt) const
+void RemoteResourceUnit::cacheUpdateCB(const RCSResourceAttributes & updatedAtt, int) const
{
std::lock_guard<std::mutex> lock(m_mutex);
(void)updatedAtt;