Delete history_record when endpoint is unmatched (#1006)

eProsima · Feb 13, 2020 · a2c564a · a2c564a
1 parent b257a33
commit a2c564a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/cpp/rtps/reader/RTPSReader.cpp b/src/cpp/rtps/reader/RTPSReader.cpp
@@ -106,13 +106,15 @@ void RTPSReader::add_persistence_guid(const RemoteWriterAttributes& wdata)
 void RTPSReader::remove_persistence_guid(const RemoteWriterAttributes& wdata)
 {
     std::lock_guard<std::recursive_timed_mutex> guard(mp_mutex);
+    GUID_t persistence_guid = persistence_guid_map_[wdata.guid];
     persistence_guid_map_.erase(wdata.guid);
-    auto count = --persistence_guid_count_[wdata.endpoint.persistence_guid];
-    if (count == 0)
+    auto count = --persistence_guid_count_[persistence_guid];
+    if (count <= 0)
     {
         if (m_att.durabilityKind < TRANSIENT)
         {
-            history_record_.erase(wdata.endpoint.persistence_guid);
+            history_record_.erase(persistence_guid);
+            persistence_guid_count_.erase(persistence_guid);
         }
     }
 }