Fix SettingClient to get instance.

[platform/framework/native/appfw.git] / src / app / FApp_AppSettingImpl.cpp

diff --git a/src/app/FApp_AppSettingImpl.cpp b/src/app/FApp_AppSettingImpl.cpp
index 4649cc2..f7aabd9 100644 (file)
--- a/src/app/FApp_AppSettingImpl.cpp
+++ b/src/app/FApp_AppSettingImpl.cpp
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -165,11 +164,10 @@ _AppSettingImpl::_MutiInstanceManager::GetInstanceByAppId(const AppId& appId)
        SysTryReturn(NID_APP, pPkgMgrImpl != null, null, E_SYSTEM,
                                 "[%s] A system error has been occurred. failed to get _PackageMaangerImpl.", GetErrorMessage(E_SYSTEM));
 
-       PackageInfo* pPackageInfo = null;
-       pPackageInfo = pPkgMgrImpl->GetPackageInfoN(packageId); // !E_SUCCESS for DB fail and query fail
+       std::unique_ptr<PackageInfo> pPackageInfo(pPkgMgrImpl->GetPackageInfoN(packageId));     // !E_SUCCESS for DB fail and query fail
        SysTryReturn(NID_APP, pPackageInfo != null, null, E_APP_NOT_INSTALLED, "[%s] Propagating.", GetErrorMessage(E_APP_NOT_INSTALLED));
 
-       const _PackageInfoImpl* pPkgInfoImpl = _PackageInfoImpl::GetInstance(pPackageInfo);
+       const _PackageInfoImpl* pPkgInfoImpl = _PackageInfoImpl::GetInstance(pPackageInfo.get());
        SysTryReturn(NID_APP, pPkgInfoImpl != null, null, E_SYSTEM,
                                 "[%s] A system error has been occurred. failed to get _PackageInfoImpl.", GetErrorMessage(E_SYSTEM));
 
@@ -200,7 +198,6 @@ _AppSettingImpl::_MutiInstanceManager::GetInstanceByAppId(const AppId& appId)
 
 CATCH:
        delete pAppSettingInstance;
-       delete pPackageInfo;
        return null;
 }
 
@@ -635,7 +632,7 @@ _AppSettingImpl::Construct(const AppId& correspondAppId, const String& version)
        SysTryReturn(NID_APP, !IsFailed(r), r, r, "[%s] Propagating.", GetErrorMessage(r));
        if (!__oldVersionInstance)
        {
-               SysTryReturnResult(NID_APP, InitizlizeDBus(), E_SYSTEM, "A system error has been occurred. DBus initialization failed.");
+               SysTryReturnResult(NID_APP, InitializeDBus(), E_SYSTEM, "A system error has been occurred. DBus initialization failed.");
        }
        r = Load();
        SysTryReturnResult(NID_APP, !IsFailed(r), E_SYSTEM, "A system error has been occurred. Loading procedure failed.");
@@ -656,7 +653,7 @@ _AppSettingImpl::ConstructByAppPath(const AppId& correspondAppId, const Tizen::B
 
        r = __settingContainer.Construct();
        SysTryReturn(NID_APP, !IsFailed(r), r, r, "[%s] Propagating.", GetErrorMessage(r));
-       SysTryReturnResult(NID_APP, InitizlizeDBus(), E_SYSTEM, "A system error has been occurred. DBus initialization failed.");
+       SysTryReturnResult(NID_APP, InitializeDBus(), E_SYSTEM, "A system error has been occurred. DBus initialization failed.");
        r = Load();
        SysTryReturn(NID_APP, !IsFailed(r), r, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -971,7 +968,7 @@ _AppSettingImpl::UpdateProperty(xmlNodePtr pNode, const String& value)
 }
 
 bool
-_AppSettingImpl::InitizlizeDBus(void)
+_AppSettingImpl::InitializeDBus(void)
 {
        DBusError error;
        dbus_error_init(&error);