1 files changed, 37 insertions, 39 deletions

diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 296f1c0e3..be84297b0 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -1216,11 +1216,10 @@ void ApplicationManagerImpl::SendMessageToMobile(
       app->protocol_version();
   }
 
-  mobile_so_factory().attachSchema(*message);
-  LOG4CXX_INFO(
-    logger_,
-    "Attached schema to message, result if valid: " << message->isValid());
-
+  mobile_so_factory().attachSchema(*message, false);
+  LOG4CXX_INFO(logger_, "Attached schema to message, result if valid: "
+                            << message->isValid());
+  
   // Messages to mobile are not yet prioritized so use default priority value
   utils::SharedPtr<Message> message_to_send(new Message(
         protocol_handler::MessagePriority::kDefault));
@@ -1350,7 +1349,7 @@ bool ApplicationManagerImpl::ManageMobileCommand(
     }
 
     // Message for "CheckPermission" must be with attached schema
-    mobile_so_factory().attachSchema(*message);
+    mobile_so_factory().attachSchema(*message, false);
   }
 
   if (message_type ==
@@ -1468,10 +1467,9 @@ void ApplicationManagerImpl::SendMessageToHMI(
     return;
   }
 
-  hmi_so_factory().attachSchema(*message);
-  LOG4CXX_INFO(
-    logger_,
-    "Attached schema to message, result if valid: " << message->isValid());
+  hmi_so_factory().attachSchema(*message, false);
+  LOG4CXX_INFO(logger_, "Attached schema to message, result if valid: "
+                            << message->isValid());
 
 #ifdef HMI_DBUS_API
   message_to_send->set_smart_object(*message);
@@ -1581,22 +1579,22 @@ bool ApplicationManagerImpl::ConvertMessageToSO(
     case ProtocolVersion::kV4:
     case ProtocolVersion::kV3:
     case ProtocolVersion::kV2: {
-        const bool conversion_result =
-            formatters::CFormatterJsonSDLRPCv2::fromString(
-            message.json_message(), output, message.function_id(),
-            message.type(), message.correlation_id());
-        if (!conversion_result
-            || !mobile_so_factory().attachSchema(output)
-            || ((output.validate() != smart_objects::Errors::OK)) ) {
-          LOG4CXX_WARN(logger_, "Failed to parse string to smart object :"
-                       << message.json_message());
-          utils::SharedPtr<smart_objects::SmartObject> response(
-                MessageHelper::CreateNegativeResponse(
-                  message.connection_key(), message.function_id(),
-                  message.correlation_id(), mobile_apis::Result::INVALID_DATA));
-          ManageMobileCommand(response);
-          return false;
-        }
+      const bool conversion_result =
+          formatters::CFormatterJsonSDLRPCv2::fromString(
+              message.json_message(), output, message.function_id(),
+              message.type(), message.correlation_id());
+      if (!conversion_result
+          || !mobile_so_factory().attachSchema(output, true)
+          || ((output.validate() != smart_objects::Errors::OK))) {
+        LOG4CXX_WARN(logger_, "Failed to parse string to smart object :"
+                     << message.json_message());
+        utils::SharedPtr<smart_objects::SmartObject> response(
+            MessageHelper::CreateNegativeResponse(
+                message.connection_key(), message.function_id(),
+                message.correlation_id(), mobile_apis::Result::INVALID_DATA));
+        ManageMobileCommand(response, commands::Command::ORIGIN_SDL);
+        return false;
+      }
       LOG4CXX_INFO(
         logger_,
         "Convertion result for sdl object is true" << " function_id "
@@ -1626,14 +1624,14 @@ bool ApplicationManagerImpl::ConvertMessageToSO(
 #ifdef ENABLE_LOG
       int32_t result =
 #endif
-      formatters::FormatterJsonRpc::FromString <
-                       hmi_apis::FunctionID::eType, hmi_apis::messageType::eType > (
-                         message.json_message(), output);
-      LOG4CXX_INFO(
-        logger_,
-        "Convertion result: " << result << " function id "
-        << output[jhs::S_PARAMS][jhs::S_FUNCTION_ID].asInt());
-      if (!hmi_so_factory().attachSchema(output)) {
+      formatters::FormatterJsonRpc::FromString<
+              hmi_apis::FunctionID::eType, hmi_apis::messageType::eType>(
+              message.json_message(), output);
+      LOG4CXX_INFO(logger_,
+                   "Convertion result: "
+                       << result << " function id "
+                       << output[jhs::S_PARAMS][jhs::S_FUNCTION_ID].asInt());
+      if (!hmi_so_factory().attachSchema(output, false)) {
         LOG4CXX_WARN(logger_, "Failed to attach schema to object.");
         return false;
       }
@@ -1687,8 +1685,9 @@ bool ApplicationManagerImpl::ConvertMessageToSO(
           output[strings::msg_params][strings::result_code] =
             NsSmartDeviceLinkRPC::V1::Result::UNSUPPORTED_VERSION;
 
-          smart_objects::SmartObjectSPtr msg_to_send = new smart_objects::SmartObject(output);
-          v1_shema.attachSchema(*msg_to_send);
+            smart_objects::SmartObjectSPtr msg_to_send =
+              new smart_objects::SmartObject(output);
+          v1_shema.attachSchema(*msg_to_send, false);
           SendMessageToMobile(msg_to_send);
           return false;
         }
@@ -2180,9 +2179,8 @@ void ApplicationManagerImpl::SendOnSDLClose() {
   utils::SharedPtr<Message> message_to_send(
     new Message(protocol_handler::MessagePriority::kDefault));
 
-  hmi_so_factory().attachSchema(*msg);
-  LOG4CXX_INFO(
-    logger_,
+  hmi_so_factory().attachSchema(*msg, false);
+  LOG4CXX_DEBUG(logger_,
     "Attached schema to message, result if valid: " << msg->isValid());