From 1699103b375d7d9c5cf0fae9cadb41be8183e940 Mon Sep 17 00:00:00 2001 From: Dennis Potman Date: Tue, 19 Nov 2019 16:39:33 +0100 Subject: [PATCH] Consistent checks for inserting and deleting writer lease duration in participants fibheap Signed-off-by: Dennis Potman --- src/core/ddsi/src/q_entity.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/ddsi/src/q_entity.c b/src/core/ddsi/src/q_entity.c index 475d690..b55606e 100644 --- a/src/core/ddsi/src/q_entity.c +++ b/src/core/ddsi/src/q_entity.c @@ -2961,9 +2961,10 @@ static dds_return_t new_writer_guid (struct writer **wr_out, const struct ddsi_g match_writer_with_local_readers (wr, tnow); sedp_write_writer (wr); - if (wr->lease_duration != NULL && wr->xqos->liveliness.kind == DDS_LIVELINESS_AUTOMATIC) + if (wr->lease_duration != NULL) { assert (wr->lease_duration->ldur != T_NEVER); + assert (wr->xqos->liveliness.kind == DDS_LIVELINESS_AUTOMATIC); assert (!is_builtin_entityid (wr->e.guid.entityid, NN_VENDORID_ECLIPSE)); /* Store writer lease duration in participant's heap in case of automatic liveliness */