Fix coverity issue

Change-Id: Ieaca864601c45b5e0972dbe557da73109735d2f4

diff --git a/UIAutomator/dbus.cpp b/UIAutomator/dbus.cpp
index d6c4ce7eaf71f7b0a40323a3579dba1bd2bb7024..05305553184525c918ab764c1ff83d1d6d5acab8 100644 (file)
--- a/UIAutomator/dbus.cpp
+++ b/UIAutomator/dbus.cpp
@@ -100,16 +100,19 @@ void DBusSignal::DBusSignalHandler(void *data, DBusMessage *msg) {
     dbus_message_iter_get_basic(&args, &second);
     dbus_message_iter_next(&args);
     _D("Type=%s, 1st=%s, 2nd=%s", type, first, second);
-  }
 
-  string action = type;
-  if (Server::getInstance().HandlerMap.find(action) != Server::getInstance().HandlerMap.end()) {
-    _D("[%s] Handler", action.c_str());
-    //sleep(1);
-    Server::getInstance().HandlerMap[action](first, second);
+    string action = type;
+    if (Server::getInstance().HandlerMap.find(action) != Server::getInstance().HandlerMap.end()) {
+      _D("[%s] Handler", action.c_str());
+      //sleep(1);
+      Server::getInstance().HandlerMap[action](first, second);
+    } else {
+      _D("Invalid Command");
+    }
   } else {
-    _D("Invalid Command");
+    _D("Invalid Message");
   }
+
   return;
 }
 
@@ -132,6 +135,8 @@ void DBusSignal::DBusAppSignalHandler(void *data, DBusMessage *msg) {
       kill(pid, 9);
       _D("PopupController kills %s during UI testing", app_name);
     }
+  } else {
+    _D("Invalid Message");
   }
 
   return;