Modify missing unlock
authordavid_kim31 <david_kim31@samsung.com>
Tue, 20 Aug 2013 01:36:08 +0000 (10:36 +0900)
committerdavid_kim31 <david_kim31@samsung.com>
Tue, 20 Aug 2013 01:36:08 +0000 (10:36 +0900)
Change-Id: Idf80ac59a87f8ce02aa18c585b7cb8ae5790e998
Signed-off-by: david_kim31 <david_kim31@samsung.com>
plugins/alarm-condition-handler/AlarmConditionHandler.cpp

index 55f9966..bed432e 100644 (file)
@@ -521,18 +521,10 @@ _AlarmConditionHandler::SettingEventCb(keynode_t* node, void* userData)
 
        pthread_mutex_lock(&alarm_lock);
        pAlarmCondHandler = _AlarmConditionHandler::GetInstance();
-       if(pAlarmCondHandler == null)
-       {
-               SysLog(NID_SYS, "There is no _AlarmConditionHandler");
-               return;
-       }
+       SysTryCatch(NID_SYS, pAlarmCondHandler != null, r = E_SYSTEM, r, "There is no _AlarmConditionHandler");
 
        pMapEnum = pAlarmCondHandler->GetAlarmConditionListN();
-       if(pMapEnum == null)
-       {
-               SysLog(NID_SYS, "Reserved condition list is empty");
-               return;
-       }
+       SysTryCatch(NID_SYS, pMapEnum != null, r = E_SYSTEM, r, "Reserved condition list is empty");
 
        if (strcmp(VCONFKEY_SYSTEM_TIME_CHANGED, vconf_keynode_get_name(node)) == 0)
        {
@@ -581,8 +573,8 @@ _AlarmConditionHandler::SettingEventCb(keynode_t* node, void* userData)
 CATCH:
        if(pMapEnum != null)
                delete pMapEnum;
-
-       pAlarmCondHandler->ReleaseInstance();
+       if(pAlarmCondHandler != null)
+               pAlarmCondHandler->ReleaseInstance();
        pthread_mutex_unlock(&alarm_lock);
 }