Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix requester and replier reuse behaviour #318

Merged
merged 1 commit into from
Nov 10, 2022
Merged

Fix requester and replier reuse behaviour #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/cpp/middleware/fastdds/FastDDSEntities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ ReturnCode_t FastDDSParticipant::delete_publisher(
return ret;
}
}
}
}
}

return ptr_->delete_publisher(publisher);
Expand Down Expand Up @@ -567,7 +567,7 @@ ReturnCode_t FastDDSParticipant::delete_subscriber(
return ret;
}
}
}
}
}

return ptr_->delete_subscriber(subscriber);
Expand Down Expand Up @@ -1225,8 +1225,8 @@ bool FastDDSRequester::match(const fastrtps::RequesterAttributes& attrs) const
fastdds::dds::SubscriberQos qos_subscriber;
set_qos_from_attributes(qos_subscriber, attrs.subscriber);

return reply_topic_->match(attrs.publisher.topic)
&& request_topic_->match(attrs.subscriber.topic)
return reply_topic_->match(attrs.subscriber.topic)
&& request_topic_->match(attrs.publisher.topic)
&& publisher_ptr_->get_qos() == qos_publisher
&& subscriber_ptr_->get_qos() == qos_subscriber;
}
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/middleware/fastdds/FastDDSMiddleware.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ bool FastDDSMiddleware::matched_requester_from_xml(
auto it = requesters_.find(requester_id);
if (requesters_.end() != it)
{
rv = it->second->match_from_ref(xml);
rv = it->second->match_from_xml(xml);
}
return rv;
}
Expand Down Expand Up @@ -1212,7 +1212,7 @@ bool FastDDSMiddleware::matched_replier_from_xml(
auto it = repliers_.find(requester_id);
if (repliers_.end() != it)
{
rv = it->second->match_from_ref(xml);
rv = it->second->match_from_xml(xml);
}
return rv;
}
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/replier/Replier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ bool Replier::matched(
}
case dds::xrce::REPRESENTATION_AS_XML_STRING:
{
const std::string& xml = new_object_rep.replier().representation().object_reference();
const std::string& xml = new_object_rep.replier().representation().xml_string_representation();
rv = proxy_client_->get_middleware().matched_replier_from_xml(get_raw_id(), xml);
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/requester/Requester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ bool Requester::matched(
}
case dds::xrce::REPRESENTATION_AS_XML_STRING:
{
const std::string& xml = new_object_rep.requester().representation().object_reference();
const std::string& xml = new_object_rep.requester().representation().xml_string_representation();
rv = proxy_client_->get_middleware().matched_requester_from_xml(get_raw_id(), xml);
break;
}
Expand Down