projects
/
platform
/
core
/
context
/
context-service.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fdaaa10
)
Check null when TemplateManager is destroyed
64/68264/1
author
Somin Kim
<somin926.kim@samsung.com>
Tue, 3 May 2016 07:07:55 +0000
(16:07 +0900)
committer
Somin Kim
<somin926.kim@samsung.com>
Tue, 3 May 2016 07:07:55 +0000
(16:07 +0900)
Change-Id: I41ca5f871ceb03d8e4639b6ce4827131dbc3826d
Signed-off-by: Somin Kim <somin926.kim@samsung.com>
src/trigger/TemplateManager.cpp
patch
|
blob
|
history
diff --git
a/src/trigger/TemplateManager.cpp
b/src/trigger/TemplateManager.cpp
index 5a2b945954d49199cf3e1777e30aea158439c0cd..5c85725724ec7f142f9490fbcb3957ee480c9a40 100644
(file)
--- a/
src/trigger/TemplateManager.cpp
+++ b/
src/trigger/TemplateManager.cpp
@@
-65,12
+65,12
@@
TemplateManager* TemplateManager::getInstance()
void TemplateManager::destroy()
{
+ IF_FAIL_VOID(__instance);
+
__instance->applyTemplates();
- if (__instance) {
- delete __instance;
- __instance = NULL;
- }
+ delete __instance;
+ __instance = NULL;
}
bool TemplateManager::init()