Skip to content

Commit ef130f7

Browse files
committed
Force reliable reliability QoS
1 parent 62c78ee commit ef130f7

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

tests/DCPS/RecorderReplayer/Relay.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@
2525

2626
#include <ace/Condition_Thread_Mutex.h>
2727

28-
bool
29-
make_dr_reliable()
30-
{
31-
OpenDDS::DCPS::TransportConfig_rch gc = TheTransportRegistry->global_config();
32-
return gc->instances_[0]->name() == "the_rtps_transport";
33-
}
34-
3528
class MessengerReplayerListener : public OpenDDS::DCPS::ReplayerListener {
3629
public:
3730
virtual void on_replayer_matched(OpenDDS::DCPS::Replayer*,
@@ -238,10 +231,7 @@ int run_test(int argc, ACE_TCHAR *argv[])
238231
sub_qos.partition.name = my_partition1;
239232

240233
DDS::DataReaderQos dr_qos = service->initial_DataReaderQos();
241-
242-
if (make_dr_reliable()) {
243-
dr_qos.reliability.kind = DDS::RELIABLE_RELIABILITY_QOS;
244-
}
234+
dr_qos.reliability.kind = DDS::RELIABLE_RELIABILITY_QOS;
245235

246236
// Create Recorder
247237
OpenDDS::DCPS::Recorder_var recorder = service->create_recorder(participant,

tests/DCPS/RecorderReplayer/Subscriber.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@
2525
# include <dds/DCPS/transport/shmem/Shmem.h>
2626
#endif
2727

28-
bool
29-
make_dr_reliable()
30-
{
31-
OpenDDS::DCPS::TransportConfig_rch gc = TheTransportRegistry->global_config();
32-
return gc->instances_[0]->name() == "the_rtps_transport";
33-
}
34-
3528
int
3629
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
3730
{
@@ -104,9 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
10497

10598
DDS::DataReaderQos dr_qos;
10699
subscriber->get_default_datareader_qos(dr_qos);
107-
if (make_dr_reliable()) {
108-
dr_qos.reliability.kind = DDS::RELIABLE_RELIABILITY_QOS;
109-
}
100+
dr_qos.reliability.kind = DDS::RELIABLE_RELIABILITY_QOS;
110101

111102
DDS::DataReader_var reader = subscriber->create_datareader(topic,
112103
dr_qos,

0 commit comments

Comments
 (0)