From: Somin Kim <somin926.kim@samsung.com>
Date: Tue, 3 May 2016 07:07:55 +0000 (+0900)
Subject: Check null when TemplateManager is destroyed
X-Git-Tag: submit/tizen/20160504.014504^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F64%2F68264%2F1;p=platform%2Fcore%2Fcontext%2Fcontext-service.git

Check null when TemplateManager is destroyed

Change-Id: I41ca5f871ceb03d8e4639b6ce4827131dbc3826d
Signed-off-by: Somin Kim <somin926.kim@samsung.com>
---

diff --git a/src/trigger/TemplateManager.cpp b/src/trigger/TemplateManager.cpp
index 5a2b945..5c85725 100644
--- 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()