Skip to content

Commit 29c739a

Browse files
committed
Refs #23365. Make transmission of new flag independent of related_sample_identity.
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
1 parent 6af4152 commit 29c739a

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

src/cpp/rtps/history/WriterHistory.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -474,10 +474,10 @@ void WriterHistory::set_fragments(
474474
if (change->write_params.related_sample_identity() != SampleIdentity::unknown())
475475
{
476476
inline_qos_size += (2 * fastdds::dds::ParameterSerializer<Parameter_t>::PARAMETER_SAMPLE_IDENTITY_SIZE);
477-
if (change->write_params.has_more_replies())
478-
{
479-
inline_qos_size += 4u;
480-
}
477+
}
478+
if (change->write_params.has_more_replies())
479+
{
480+
inline_qos_size += 4u;
481481
}
482482
if (ChangeKind_t::ALIVE != change->kind && TopicKind_t::WITH_KEY == mp_writer->getAttributes().topicKind)
483483
{

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ struct DataMsgUtils
4747
(nullptr != inlineQos) ||
4848
((WITH_KEY == topicKind) &&
4949
(!change->writerGUID.is_builtin() || expectsInlineQos || change->kind != ALIVE)) ||
50-
(change->write_params.related_sample_identity() != SampleIdentity::unknown());
50+
(change->write_params.related_sample_identity() != SampleIdentity::unknown()) ||
51+
(change->write_params.has_more_replies());
5152

5253
dataFlag = ALIVE == change->kind &&
5354
change->serializedPayload.length > 0 && nullptr != change->serializedPayload.data;
@@ -132,11 +133,11 @@ struct DataMsgUtils
132133
fastdds::dds::ParameterSerializer<fastdds::dds::Parameter_t>::add_parameter_custom_related_sample_identity(
133134
msg,
134135
change->write_params.related_sample_identity());
136+
}
135137

136-
if (change->write_params.has_more_replies())
137-
{
138-
fastdds::dds::ParameterSerializer<fastdds::dds::Parameter_t>::add_parameter_more_replies(msg);
139-
}
138+
if (change->write_params.has_more_replies())
139+
{
140+
fastdds::dds::ParameterSerializer<fastdds::dds::Parameter_t>::add_parameter_more_replies(msg);
140141
}
141142

142143
if (WITH_KEY == topicKind && (!change->writerGUID.is_builtin() || expectsInlineQos || ALIVE != change->kind))

0 commit comments

Comments
 (0)