Tue Aug 10 08:10:08 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/ContentFilterSetting.cpp:
        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
        * connectors/dds4ccm/impl/DDS_Get_T.h:
        * connectors/dds4ccm/impl/DDS_Get_T.cpp:
        * connectors/dds4ccm/impl/DDS_Listen_T.h:
        * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
        * connectors/dds4ccm/impl/DDS_StateListen_T.h:
        * connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h:
        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
        * connectors/dds4ccm/impl/DataReader_T.cpp:
        * connectors/dds4ccm/impl/Subscriber_T.h:
          Throw an internal exception if setting the listener fails. Also
          configuration_complete is now void, in case of a problem we throw
          an exception

16 files changed, 73 insertions, 60 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 8c97a5f414e..42f0f268942 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,24 @@
+Tue Aug 10 08:10:08 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/ContentFilterSetting.cpp:
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Get_T.h:
+        * connectors/dds4ccm/impl/DDS_Get_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Listen_T.h:
+        * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
+        * connectors/dds4ccm/impl/DDS_StateListen_T.h:
+        * connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h:
+        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
+        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
+        * connectors/dds4ccm/impl/DataReader_T.cpp:
+        * connectors/dds4ccm/impl/Subscriber_T.h:
+          Throw an internal exception if setting the listener fails. Also
+          configuration_complete is now void, in case of a problem we throw
+          an exception
+
 Tue Aug 10 07:00:56 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/DDSDataWriterListener_T.h:
diff --git a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp
index 0c49437d19b..091c5ec90e9 100644
--- a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp
@@ -58,7 +58,7 @@ namespace CIAO
       DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic");
 
       ::DDS::DomainParticipant_var dp = subscriber->get_participant ();
-      if (CORBA::is_nil (dp.in ()))
+      if (::CORBA::is_nil (dp.in ()))
         {
           DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
                         "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: "
@@ -82,7 +82,7 @@ namespace CIAO
                                                     topic,
                                                     this->filter_.expression,
                                                     this->filter_.parameters);
-      if (CORBA::is_nil (this->cft_.in ()))
+      if (::CORBA::is_nil (this->cft_.in ()))
         {
           DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
                         "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: "
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
index 595659767e5..04d2e3ba056 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
@@ -182,12 +182,14 @@ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::ccm_activate (void)
   ::DDS::ReturnCode_t const retcode = this->domain_participant_->set_listener (
                               this->domainparticipantlistener_.in (),
                               DomainParticipantListener::get_mask ());
+                              
   if (retcode != DDS_RETCODE_OK)
     {
       DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
                     "DDS_Base_Connector_T::ccm_activate - "
                     "Error setting the listener on the domain participant - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 }
 
@@ -207,6 +209,7 @@ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::ccm_passivate (void)
                     "Error while setting the listener on the "
                     "domain participant - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 
   this->domainparticipantlistener_ = ::DDS::DomainParticipantListener::_nil ();
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
index 284ac9743d1..6ac91527a75 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
@@ -14,7 +14,7 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::~DDS_Get_T (void)
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
-bool
+void
 DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete (
   typename CCM_TYPE::base_type::_ptr_type component,
   ::DDS::Topic_ptr topic,
@@ -23,17 +23,13 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete (
   const char* profile_name)
 {
   DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete");
-  if (DDSSubscriberBase_type::configuration_complete (component,
+  DDSSubscriberBase_type::configuration_complete (component,
                                                       topic,
                                                       subscriber,
                                                       library_name,
-                                                      profile_name))
-    {
-      this->dds_get_.set_impl (&this->data_reader_,
-                               &this->condition_manager_);
-      this->dds_get_._set_component (component);
-    }
-  return true;
+                                                      profile_name);
+  this->dds_get_.set_impl (&this->data_reader_, &this->condition_manager_);
+  this->dds_get_._set_component (component);
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h
index 7056c63d220..33a0697e789 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h
@@ -32,7 +32,7 @@ public:
   typename CCM_TYPE::getter_type::_ptr_type get_fresh_data (void);
   //@}
 
-  bool configuration_complete (
+  void configuration_complete (
     typename CCM_TYPE::base_type::_ptr_type component,
     ::DDS::Topic_ptr topic,
     ::DDS::Subscriber_ptr subscriber,
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
index cd142833439..8702823e2f3 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
@@ -16,7 +16,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::~DDS_Listen_T (void)
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
-bool
+void
 DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete (
   typename CCM_TYPE::base_type::_ptr_type component,
   ::DDS::Topic_ptr topic,
@@ -26,19 +26,13 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete (
 {
   DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete");
 
-  bool result = false;
-  if (DDSSubscriberBase_type::configuration_complete (
+  DDSSubscriberBase_type::configuration_complete (
             component,
             topic,
             subscriber,
             library_name,
-            profile_name))
-    {
-      this->data_control_._set_component (component);
-      result = true;
-    }
-    
-  return result;
+            profile_name);
+  this->data_control_._set_component (component);
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
@@ -72,6 +66,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate (
                     "DDS_Listen_T::activate - "
                     "Error while setting the listener on the listen - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h
index 0f8f46e370d..b9548a8cdf8 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h
@@ -41,7 +41,7 @@ public:
   ::CCM_DDS::CCM_DataListenerControl_ptr get_data_control (void);
   //@}
 
-  bool configuration_complete (
+  void configuration_complete (
     typename CCM_TYPE::base_type::_ptr_type component,
     ::DDS::Topic_ptr topic,
     ::DDS::Subscriber_ptr subscriber,
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
index 37bfde37dac..182ba848026 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
@@ -19,7 +19,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::~DDS_StateListen_T (v
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
-bool
+void
 DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete (
   typename CCM_TYPE::base_type::_ptr_type component,
   ::DDS::Topic_ptr topic,
@@ -29,19 +29,14 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complet
 {
   DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete");
 
-  bool result = false;
-  if (DDSSubscriberBase_type::configuration_complete (
+  DDSSubscriberBase_type::configuration_complete (
             component,
             topic,
             subscriber,
             library_name,
-            profile_name))
-    {
-      this->data_control_._set_component (component);
-      result = true;
-    }
-    
-  return result;
+            profile_name);
+            
+  this->data_control_._set_component (component);
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
@@ -73,6 +68,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate (
                     "DDS_StateListen_T::activate - "
                     "Error setting the listener on the DataReader - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
index c8018b391ab..18cea2335e2 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
@@ -37,7 +37,7 @@ public:
   ::CCM_DDS::CCM_StateListenerControl_ptr get_data_control (void);
   //@}
 
-  bool configuration_complete (
+  void configuration_complete (
     typename CCM_TYPE::base_type::_ptr_type component,
     ::DDS::Topic_ptr topic,
     ::DDS::Subscriber_ptr subscriber,
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
index 4c33709ff8c..479196b1327 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
@@ -16,7 +16,7 @@ DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::~DDS_Subscriber_B
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
-bool
+void
 DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete (
   typename CCM_TYPE::base_type::_ptr_type component,
   ::DDS::Topic_ptr topic,
@@ -57,9 +57,7 @@ DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_com
       this->dds_read_.set_impl (&this->data_reader_,
                                 &this->condition_manager_);
       this->dds_read_._set_component (component);
-      return true;
     }
-  return false;
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
@@ -87,6 +85,7 @@ DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate (
                     "DDS_Subscriber_Base_T::activate - "
                     "Error while setting the listener on the subscriber - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h
index 58174e2ae0e..dfeb95661c6 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h
@@ -45,7 +45,7 @@ public:
   void filter (const ::CCM_DDS::QueryFilter & filter);
   //@}
 
-  bool configuration_complete (
+  void configuration_complete (
     typename CCM_TYPE::base_type::_ptr_type component,
     ::DDS::Topic_ptr topic,
     ::DDS::Subscriber_ptr subscriber,
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp
index 0e3d9f4a22d..f36d166d753 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp
@@ -273,6 +273,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate_default_top
                     "DDS_TopicBase_Connector_T::activate_default_topic - "
                     "Error while setting the listener on the topic - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();                    
     }
 }
 
@@ -290,6 +291,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate_subscriber
                           reactor),
                         ::CORBA::NO_MEMORY ());
     }
+    
   ::DDS::ReturnCode_t const retcode = this->subscriber_->set_listener (
                             this->subscriber_listener_.in (),
                             SubscriberListener::get_mask (
@@ -300,6 +302,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate_subscriber
                     "DDS_TopicBase_Connector_T::activate_subscriber - "
                     "Error while setting the listener on the subscriber - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();                    
     }
 }
 
@@ -318,6 +321,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate_publisher (
                           reactor),
                         ::CORBA::NO_MEMORY ());
     }
+
   ::DDS::ReturnCode_t const retcode = this->publisher_->set_listener (
                             this->publisher_listener_.in (),
                             PublisherListener::get_mask (
@@ -328,6 +332,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate_publisher (
                     "DDS_TopicBase_Connector_T::activate_publisher - "
                     "Error while setting the listener on the publisher - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();                    
     }
 }
 
@@ -346,6 +351,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::passivate_default_to
                     "DDS_TopicBase_Connector_T::passivate_default_topic - "
                     "Error while setting the listener on the topic - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 
   this->topiclistener_ = ::DDS::TopicListener::_nil ();
@@ -366,6 +372,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::passivate_subscriber
                     "DDS_TopicBase_Connector_T::passivate_subscriber - "
                     "Error while setting the listener on the subscriber - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 
   this->subscriber_listener_ = ::DDS::SubscriberListener::_nil ();
@@ -386,6 +393,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::passivate_publisher
                     "DDS_TopicBase_Connector_T::passivate_publisher - "
                     "Error while setting the listener on the publisher - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 
   this->publisher_listener_ = ::DDS::PublisherListener::_nil ();
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
index cebefb0038c..827b11a21f1 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
@@ -88,6 +88,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate ()
                     "DDS_Update_T::activate - "
                     "Error while setting the listener on the updater - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 }
 
@@ -105,6 +106,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::passivate ()
                     "DDS_Update_T::passivate - "
                     "Error while setting the listener on the writer - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 
   this->data_listener_ = ::DDS::DataWriterListener::_nil ();
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
index e5f39586ca2..42fa4a86dd8 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
@@ -85,6 +85,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate ()
                     "DDS_Write_T::activate - "
                     "Error setting the listener on the writer - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 }
 
@@ -103,6 +104,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::passivate ()
                     "DDS_Write_T::passivate - "
                     "Error while setting the listener on the writer - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 
   this->data_listener_ = ::DDS::DataWriterListener::_nil ();
diff --git a/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp
index b52ec4b69a4..5381f676327 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp
@@ -266,6 +266,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::passivate ()
                     "DataReader_T::passivate - "
                     "Error while setting the listener on the data reader - <%C>\n",
                     ::CIAO::DDS4CCM::translate_retcode (retcode)));
+      throw ::CORBA::INTERNAL ();
     }
 }
 
@@ -298,6 +299,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datareader
             ::DDS::DataReaderListener::_nil (),
             0);
     }
+
   this->set_impl(reader.in ());
 }
 
@@ -793,14 +795,14 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::set_impl (
       if (!this->impl_)
         {
           DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                        "CIAO::DDS4CCM::DataReader_T::create_datareader - "
+                        "CIAO::DDS4CCM::DataReader_T::set_impl - "
                         "Failed to cast DDS::DataReader to DataReader_T\n"));
         }
     }
   else
     {
       DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                    "CIAO::DDS4CCM::DataReader_T::create_datareader - "
+                    "CIAO::DDS4CCM::DataReader_T::set_impl - "
                     "Failed to cast DDS::DataReader to DataReader_T\n"));
       throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
     }
diff --git a/CIAO/connectors/dds4ccm/impl/Subscriber_T.h b/CIAO/connectors/dds4ccm/impl/Subscriber_T.h
index ecd3c681d69..187e7ed0295 100644
--- a/CIAO/connectors/dds4ccm/impl/Subscriber_T.h
+++ b/CIAO/connectors/dds4ccm/impl/Subscriber_T.h
@@ -96,13 +96,11 @@ namespace CIAO
 #endif
 
       virtual ::DDS::ReturnCode_t
-      delete_datareader (
-        ::DDS::DataReader_ptr a_datareader);
+      delete_datareader (::DDS::DataReader_ptr a_datareader);
 
       virtual ::DDS::ReturnCode_t delete_contained_entities (void);
 
-      virtual ::DDS::DataReader_ptr lookup_datareader (
-        const char * impl_name);
+      virtual ::DDS::DataReader_ptr lookup_datareader (const char * impl_name);
 
       virtual ::DDS::ReturnCode_t
       get_datareaders (
@@ -111,33 +109,24 @@ namespace CIAO
         ::DDS::ViewStateMask view_states,
         ::DDS::InstanceStateMask instance_states);
 
-      virtual ::DDS::ReturnCode_t
-      notify_datareaders (void);
+      virtual ::DDS::ReturnCode_t notify_datareaders (void);
 
-      virtual ::DDS::ReturnCode_t
-      set_qos (
-        const ::DDS::SubscriberQos & qos);
+      virtual ::DDS::ReturnCode_t set_qos (const ::DDS::SubscriberQos & qos);
 
-      virtual ::DDS::ReturnCode_t
-      get_qos (
-        ::DDS::SubscriberQos & qos);
+      virtual ::DDS::ReturnCode_t get_qos (::DDS::SubscriberQos & qos);
 
       virtual ::DDS::ReturnCode_t
       set_listener (
         ::DDS::SubscriberListener_ptr a_listener,
         ::DDS::StatusMask mask);
 
-      virtual ::DDS::SubscriberListener_ptr
-      get_listener (void);
+      virtual ::DDS::SubscriberListener_ptr get_listener (void);
 
-      virtual ::DDS::ReturnCode_t
-      begin_access (void);
+      virtual ::DDS::ReturnCode_t begin_access (void);
 
-      virtual ::DDS::ReturnCode_t
-      end_access (void);
+      virtual ::DDS::ReturnCode_t end_access (void);
 
-      virtual ::DDS::DomainParticipant_ptr
-      get_participant (void);
+      virtual ::DDS::DomainParticipant_ptr get_participant (void);
 
       virtual ::DDS::ReturnCode_t
       set_default_datareader_qos (