1 files changed, 20 insertions, 12 deletions

diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
index 521574df5af..37c1eb8de49 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
@@ -126,11 +126,23 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete (void)
     this->library_name_,
     this->profile_name_);
 
+  this->push_state_observer_.configuration_complete (
+    this->topic_.in (),
+    this->subscriber_.in (),
+    this->library_name_,
+    this->profile_name_);
+
   this->pull_observer_.configuration_complete (
     this->topic_.in (),
     this->subscriber_.in (),
     this->library_name_,
     this->profile_name_);
+
+  this->passive_observer_.configuration_complete (
+    this->topic_.in (),
+    this->subscriber_.in (),
+    this->library_name_,
+    this->profile_name_);
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
@@ -148,23 +160,15 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (void)
     this->context_->get_connection_push_observer_data_listener (),
     this->context_->get_connection_push_observer_status ());
 
-  this->push_state_observer_.init (
+  this->push_state_observer_.activate (
     this->context_->get_connection_push_state_observer_data_listener (),
-    this->context_->get_connection_push_state_observer_status (),
-    this->topic_.in (),
-    this->subscriber_.in (),
-    this->library_name_,
-    this->profile_name_);
+    this->context_->get_connection_push_state_observer_status ());
 
   this->pull_observer_.activate (
     this->context_->get_connection_pull_observer_status ());
 
-  this->passive_observer_.init (
-    this->context_->get_connection_passive_observer_status (),
-    this->topic_.in (),
-    this->subscriber_.in (),
-    this->library_name_,
-    this->profile_name_);
+  this->passive_observer_.activate (
+    this->context_->get_connection_passive_observer_status ());
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
@@ -173,7 +177,9 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate (void)
 {
   DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate ();
   this->push_observer_.passivate ();
+  this->push_state_observer_.passivate ();
   this->pull_observer_.passivate ();
+  this->passive_observer_.passivate ();
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
@@ -182,6 +188,8 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove (void)
 {
   DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove ();
   this->push_observer_.remove ();
+  this->push_state_observer_.remove ();
   this->pull_observer_.remove ();
+  this->passive_observer_.remove ();
 }