Correctly give priority to intraprocess over data sharing (#2202)

(cherry picked from commit 3c7be7e) Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
eProsima · Sep 14, 2021 · b820c35 · b820c35
1 parent 98cb08c
commit b820c35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/cpp/rtps/reader/StatefulReader.cpp b/src/cpp/rtps/reader/StatefulReader.cpp
@@ -155,8 +155,8 @@ bool StatefulReader::matched_writer_add(
         return false;
     }
 
-    bool is_datasharing = is_datasharing_compatible_with(wdata);
     bool is_same_process = RTPSDomainImpl::should_intraprocess_between(m_guid, wdata.guid());
+    bool is_datasharing = !is_same_process && is_datasharing_compatible_with(wdata);
 
     for (WriterProxy* it : matched_writers_)
     {

diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp
@@ -101,8 +101,8 @@ bool StatelessReader::matched_writer_add(
         }
     }
 
-    bool is_datasharing = is_datasharing_compatible_with(wdata);
     bool is_same_process = RTPSDomainImpl::should_intraprocess_between(m_guid, wdata.guid());
+    bool is_datasharing = !is_same_process && is_datasharing_compatible_with(wdata);
 
     RemoteWriterInfo_t info;
     info.guid = wdata.guid();

diff --git a/src/cpp/rtps/writer/ReaderLocator.cpp b/src/cpp/rtps/writer/ReaderLocator.cpp
@@ -78,6 +78,7 @@ bool ReaderLocator::start(
         locator_info_.remote_guid = remote_guid;
 
         is_local_reader_ = RTPSDomainImpl::should_intraprocess_between(owner_->getGuid(), remote_guid);
+        is_datasharing &= !is_local_reader_;
         local_reader_ = nullptr;
 
         if (!is_local_reader_ && !is_datasharing)