Fix wrong format of exit transaction

Change-Id: If16581b4dd73a8daec06d743e30e9379eb234b48

diff --git a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
index e80cbf7..54e92a9 100644 (file)
--- a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
+++ b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
@@ -948,8 +948,10 @@ private:
         m_send_trans.clear();
         m_send_trans.put_command(SCIM_TRANS_CMD_REPLY);
 
-        if (m_info_manager->socket_get_client_info(client).type == HELPER_CLIENT)
+        if (m_info_manager->socket_get_client_info(client).type == HELPER_CLIENT) {
+            m_send_trans.put_data(context);
             m_send_trans.put_data(m_info_manager->get_current_helper_uuid());
+        }
 
         m_send_trans.put_command(SCIM_TRANS_CMD_EXIT);
 

diff --git a/ism/src/scim_helper.cpp b/ism/src/scim_helper.cpp
index 3197e43..2b6af6f 100644 (file)
--- a/ism/src/scim_helper.cpp
+++ b/ism/src/scim_helper.cpp
@@ -436,13 +436,17 @@ HelperAgent::filter_event ()
     uint32 ic = (uint32) -1;
     String ic_uuid;
 
-    if (!m_impl->recv.get_command (cmd) || cmd != SCIM_TRANS_CMD_REPLY)
+    if (!m_impl->recv.get_command (cmd) || cmd != SCIM_TRANS_CMD_REPLY) {
+        LOGW ("wrong format of transaction");
         return true;
+    }
 
     /* If there are ic and ic_uuid then read them. */
     if (!(m_impl->recv.get_data_type () == SCIM_TRANS_DATA_COMMAND) &&
-        !(m_impl->recv.get_data (ic) && m_impl->recv.get_data (ic_uuid)))
+        !(m_impl->recv.get_data (ic) && m_impl->recv.get_data (ic_uuid))) {
+        LOGW ("wrong format of transaction");
         return true;
+    }
 
     while (m_impl->recv.get_command (cmd)) {
         switch (cmd) {
@@ -536,7 +540,6 @@ HelperAgent::filter_event ()
             case ISM_TRANS_CMD_HIDE_ISE_PANEL:
             {
                 LOGD ("Helper ISE received ISM_TRANS_CMD_HIDE_ISE_PANEL message\n");
-
                 m_impl->signal_ise_hide (this, ic, ic_uuid);
                 break;
             }