X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fapp.cpp;h=d11ec8a498ecfc605d2535c257340514b30d04dc;hb=c79b70f564aaad2194c4f24a653fbb94b7ac397a;hp=5bd597c8caf67579129626ea4f67962f64ea2818;hpb=5d5a780a405fdb71a85898d8d988f6ee1bf3b3e0;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index 5bd597c..d11ec8a 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -35,7 +35,7 @@
 #include <regex>
 #include <thread>
 
-#include "wm-client.hpp"
+#include "wm_client.hpp"
 #include "applist.hpp"
 
 extern "C"
@@ -572,8 +572,15 @@ WMError App::do_transition(unsigned req_num)
     * Check Policy
     */
     // get current trigger
-    auto trigger = g_app_list.getRequest(req_num);
+    bool found;
     bool is_activate = true;
+    auto trigger = g_app_list.getRequest(req_num, &found);
+    if(!found)
+    {
+        WMError err = WMError::NO_ENTRY;
+        HMI_SEQ_ERROR(req_num, errorDescription(err));
+        return err;
+    }
 
     /*  get new status from Policy Manager
 
@@ -606,8 +613,14 @@ WMError App::do_transition(unsigned req_num)
 
     // layer manager task
     bool sync_draw_happen = false;
-    for (const auto &y : g_app_list.getActions(req_num))
+    for (const auto &y : g_app_list.getActions(req_num, &found))
     {
+        if (!found)
+        {
+            WMError err = WMError::NO_ENTRY;
+            HMI_SEQ_ERROR(req_num, "%s : Action is not set", errorDescription(err));
+            return err;
+        }
         /*
         do_task(y);
         */
@@ -1006,7 +1019,15 @@ void App::lm_enddraw(const char *drawing_name)
 void App::do_enddraw(unsigned req_num)
 {
     // get actions
-    auto actions = g_app_list.getActions(req_num);
+    bool found;
+    auto actions = g_app_list.getActions(req_num, &found);
+    if (!found)
+    {
+        WMError err = WMError::NO_ENTRY;
+        HMI_SEQ_ERROR(req_num, errorDescription(err));
+        return;
+    }
+
     HMI_SEQ_INFO(req_num, "do endDraw");
 
     for (const auto &act : actions)