activationLock.lock();
- try{
+ try
+ {
if (!configFile.empty())
{
m_config = new Configuration(configFile);
}
OIC_LOG(INFO, CONTAINER_TAG, "Resource container started.");
- }catch(...){
+ }
+ catch (...)
+ {
OIC_LOG(INFO, CONTAINER_TAG, "Resource container failed starting.");
}
activationLock.unlock();
}
if (m_config)
+ {
delete m_config;
+ }
}
void ResourceContainerImpl::activateBundle(shared_ptr<RCSBundleInfo> bundleInfo)
std::string(m_bundles[id]->getID()).c_str());
activationLock.lock();
- try{
+ try
+ {
activateBundleThread(id);
}
- catch(...){
+ catch (...)
+ {
OIC_LOG_V(INFO, CONTAINER_TAG, "Activating bundle: (%s) failed",
std::string(m_bundles[id]->getID()).c_str());
}
registerExtBundle(bundleInfo);
#endif
}
- else if(has_suffix(bundleInfo->getPath(), ".so"))
+ else if (has_suffix(bundleInfo->getPath(), ".so"))
{
bundleInfoInternal->setSoBundle(true);
bundleInfoInternal->setJavaBundle(false);
registerSoBundle(bundleInfo);
}
// other cases might be for example .apk for android, which are loaded in the wrapper
- else{
+ else
+ {
bundleInfoInternal->setSoBundle(false);
bundleInfoInternal->setJavaBundle(false);
registerExtBundle(bundleInfo);
{
unregisterBundleSo(bundleInfo->getID());
}
- else if(bundleInfoInternal->getJavaBundle())
+ else if (bundleInfoInternal->getJavaBundle())
{
#if(JAVA_SUPPORT)
unregisterBundleJava(bundleInfo->getID());
OIC_LOG_V(INFO, CONTAINER_TAG, "Unregister bundle: (%s)",
std::string(m_bundles[id]->getID()).c_str());
- const char *error;
+ const char *error = NULL;
dlclose(bundleHandle);
if ((error = dlerror()) != NULL)
registrationLock.lock();
if (m_mapResources.find(strUri) == m_mapResources.end())
{
- if (strInterface.empty()) {
+ if (strInterface.empty())
+ {
strInterface = "oic.if.baseline";
}
strResourceType).c_str());
discoverInputResource(strUri);
}
- else{
+ else
+ {
OIC_LOG_V(INFO, CONTAINER_TAG, "Resource has no input (%s)",
std::string(strUri + ", " +
strResourceType).c_str());
{
m_config->getResourceConfiguration(bundleId, configOutput);
}
- else{
+ else
+ {
OIC_LOG_V(DEBUG, CONTAINER_TAG, "no config present ");
}
}
if (m_bundles.find(bundleId) != m_bundles.end())
{
if (!m_bundles[bundleId]->isActivated())
+ {
activateBundle(m_bundles[bundleId]);
+ }
else
{
OIC_LOG(ERROR, CONTAINER_TAG, "Bundle already started");
if (m_bundles.find(bundleId) != m_bundles.end())
{
if (m_bundles[bundleId]->isActivated())
+ {
deactivateBundle(m_bundles[bundleId]);
+ }
else
{
OIC_LOG(ERROR, CONTAINER_TAG, "Bundle not activated");
(void) bundleUri;
if (m_bundles.find(bundleId) != m_bundles.end())
+ {
OIC_LOG(ERROR, CONTAINER_TAG, "BundleId already exist");
+ }
else
{
{
shared_ptr<BundleInfoInternal> bundleInfo = m_bundles[bundleId];
if (bundleInfo->isActivated())
+ {
deactivateBundle(bundleInfo);
+ }
if (bundleInfo->isLoaded())
+ {
unregisterBundle(bundleInfo);
+ }
}
else
{
newResourceInfo.uri = resourceUri;
if (params.find(OUTPUT_RESOURCE_NAME) != params.end())
+ {
newResourceInfo.name = params[OUTPUT_RESOURCE_NAME];
+ }
if (params.find(OUTPUT_RESOURCE_TYPE) != params.end())
+ {
newResourceInfo.resourceType = params[OUTPUT_RESOURCE_TYPE];
+ }
if (params.find(OUTPUT_RESOURCE_ADDR) != params.end())
+ {
newResourceInfo.address = params[OUTPUT_RESOURCE_ADDR];
+ }
addSoBundleResource(bundleId, newResourceInfo);
}
void ResourceContainerImpl::registerSoBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Register SO bundle");
- const char *error;
+ const char *error = NULL;
activator_t *bundleActivator = NULL;
deactivator_t *bundleDeactivator = NULL;
{
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
- else{
+ else
+ {
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
bundleInfoInternal->getActivatorName()
+ "_externalActivateBundle").c_str());
{
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
- else{
+ else
+ {
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
bundleInfoInternal->getActivatorName()
+ "_externalDeactivateBundle").c_str());
{
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
- else{
+ else
+ {
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
bundleInfoInternal->getActivatorName()
+ "_externalCreateResource").c_str());
{
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
- else{
+ else
+ {
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
bundleInfoInternal->getActivatorName()
+ "_externalDestroyResource").c_str());
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Register SO bundle finished");
}
- void ResourceContainerImpl::registerExtBundle(shared_ptr<RCSBundleInfo> bundleInfo){
+ void ResourceContainerImpl::registerExtBundle(shared_ptr<RCSBundleInfo> bundleInfo)
+ {
OIC_LOG_V(INFO, CONTAINER_TAG, "Registering ext bundle (%s)",
std::string(bundleInfo->getID()).c_str());
OIC_LOG_V(INFO, CONTAINER_TAG, "Activator name (%s)",
void ResourceContainerImpl::addSoBundleResource(const std::string &bundleId,
resourceInfo newResourceInfo)
{
- resourceCreator_t *resourceCreator;
+ resourceCreator_t *resourceCreator = nullptr;
resourceCreator = m_bundles[bundleId]->getResourceCreator();
activateJavaBundle(id);
#endif
}
- else if(m_bundles[id]->getSoBundle())
+ else if (m_bundles[id]->getSoBundle())
{
activateSoBundle (id);
}