summaryrefslogtreecommitdiff
path: root/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp')
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
index f1dd8ab5106..4bf2cb8068f 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
@@ -300,24 +300,11 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::topic_name (
{
DDS4CCM_TRACE ("DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::topic_name");
- this->late_binding (ACE_OS::strlen (topic_name) == 0);
-
- if (this->late_binding () &&
- ACE_OS::strlen (topic_name) > 0 &&
- ACE_OS::strlen (this->topic_name_.in ()) == 0)
+ if (this->late_binded (topic_name))
{
- TopicBaseConnector::topic_name (topic_name);
this->do_configuration_complete ();
this->do_ccm_activate ();
}
- else if (this->configuration_complete_)
- {
- throw ::CCM_DDS::NonChangeable ();
- }
- else
- {
- TopicBaseConnector::topic_name (topic_name);
- }
}
template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>