Minor changes and moving logs

Signed-off-by: Emilio Cuesta <emiliocuesta@eprosima.com>

Author: emiliocuestaf

src/cpp/fastdds/publisher/DataWriterImpl.cpp

@@ -778,7 +778,7 @@ ReturnCode_t DataWriterImpl::check_instance_preconditions(
 #if !defined(NDEBUG)
     if (handle.isDefined() && instance_handle != handle)
     {
-        EPROSIMA_LOG_ERROR(DATA_WRITER, "handle differs from data's key.");
+        EPROSIMA_LOG_ERROR(DATA_WRITER, "Handle differs from data's key.");
         return RETCODE_PRECONDITION_NOT_MET;
     }
 #endif // if !defined(NDEBUG)

src/cpp/rtps/messages/RTPSMessageGroup.cpp

@@ -631,7 +631,7 @@ bool RTPSMessageGroup::add_data(
     if (!RTPSMessageCreator::addSubmessageData(submessage_msg_, &change_to_add, endpoint_->getAttributes().topicKind,
             readerId, expectsInlineQos, inline_qos, is_big_submessage, copy_data, pending_buffer_, pending_padding_))
     {
-        EPROSIMA_LOG_ERROR(RTPS_WRITER, "Cannot add DATA submsg to the CDRMessage. Buffer too small");
+        EPROSIMA_LOG_ERROR(RTPS_WRITER, "Cannot add DATA submsg to the CDRMessage. Either buffer is too small or handle was required and not set");
         change_to_add.serializedPayload.data = nullptr;
         return false;
     }
@@ -750,7 +750,7 @@ bool RTPSMessageGroup::add_data_frag(
             change_to_add.serializedPayload, endpoint_->getAttributes().topicKind, readerId,
             expectsInlineQos, inline_qos, copy_data, pending_buffer_, pending_padding_))
     {
-        EPROSIMA_LOG_ERROR(RTPS_WRITER, "Cannot add DATA_FRAG submsg to the CDRMessage. Buffer too small");
+        EPROSIMA_LOG_ERROR(RTPS_WRITER, "Cannot add DATA_FRAG submsg to the CDRMessage. Either buffer is too small or handle was required and not set");
         change_to_add.serializedPayload.data = nullptr;
         return false;
     }

src/cpp/rtps/messages/submessages/DataMsg.hpp

@@ -167,16 +167,8 @@ struct DataMsgUtils
             }
             else
             {
-                if (ALIVE != change->kind || expectsInlineQos)
-                {
-                    EPROSIMA_LOG_ERROR(RTPS_WRITER,
-                            "Changes in KEYED Writers need a valid instanceHandle. The behavior is undefined");
-                }
-                else
-                {
-                    EPROSIMA_LOG_WARNING(RTPS_WRITER,
-                            "Changes in KEYED Writers need a valid instanceHandle. The data will be handled as if it came from an unkeyed topic.");
-                }
+                EPROSIMA_LOG_WARNING(RTPS_WRITER,
+                        "Change does not have a valid instanceHandle. KEY_HASH will not be serialized.");
             }
         }
 
@@ -279,6 +271,15 @@ bool RTPSMessageCreator::addSubmessageData(
     //Add INLINE QOS AND SERIALIZED PAYLOAD DEPENDING ON FLAGS:
     if (inlineQosFlag) //inlineQoS
     {
+        if(WITH_KEY == topicKind &&
+           change->instanceHandle.isDefined() == false &&
+           (expectsInlineQos || change->kind != ALIVE))
+        {
+            // Instance handle is required but not defined
+            EPROSIMA_LOG_ERROR(RTPS_WRITER,
+                    "Changes in KEYED Writers need a valid instanceHandle. Message won't be serialized");
+            return false;
+        }
         DataMsgUtils::serialize_inline_qos(msg, change, topicKind, expectsInlineQos, inlineQos, status);
     }
 
@@ -469,6 +470,15 @@ bool RTPSMessageCreator::addSubmessageDataFrag(
     //Add INLINE QOS AND SERIALIZED PAYLOAD DEPENDING ON FLAGS:
     if (inlineQosFlag) //inlineQoS
     {
+        if(WITH_KEY == topicKind &&
+           change->instanceHandle.isDefined() == false &&
+           (expectsInlineQos || change->kind != ALIVE))
+        {
+            // Instance handle is required but not defined
+            EPROSIMA_LOG_ERROR(RTPS_WRITER,
+                    "Changes in KEYED Writers need a valid instanceHandle. Message won't be serialized");
+            return false;
+        }
         DataMsgUtils::serialize_inline_qos(msg, change, topicKind, expectsInlineQos, inlineQos, status);
     }