Mon Aug 9 14:50:25 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp:
        * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
        * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
        * connectors/dds4ccm/impl/DataListenerControl_T.h:
        * connectors/dds4ccm/impl/DataReaderHandler_T.cpp:
        * connectors/dds4ccm/impl/Getter_T.h:
        * connectors/dds4ccm/impl/InstanceHandleManager_T.h:
        * connectors/dds4ccm/impl/LocalObject_T.h:
        * connectors/dds4ccm/impl/LocalObject_T.cpp:
        * connectors/dds4ccm/impl/Reader_T.h:
          Renamed DDS4CCM_LocalObject to LocalObject, no need for DDS4CCM
          prefix, it is already in that namespace. Added more logging in all
          handle_exception methods

        * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h:
        * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.cpp:
          Removed these files.

11 files changed, 151 insertions, 31 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 971a6682d6a..55e9936c37a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,23 @@
+Mon Aug  9 14:50:25 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp:
+        * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DataListenerControl_T.h:
+        * connectors/dds4ccm/impl/DataReaderHandler_T.cpp:
+        * connectors/dds4ccm/impl/Getter_T.h:
+        * connectors/dds4ccm/impl/InstanceHandleManager_T.h:
+        * connectors/dds4ccm/impl/LocalObject_T.h:
+        * connectors/dds4ccm/impl/LocalObject_T.cpp:
+        * connectors/dds4ccm/impl/Reader_T.h:
+          Renamed DDS4CCM_LocalObject to LocalObject, no need for DDS4CCM
+          prefix, it is already in that namespace. Added more logging in all
+          handle_exception methods
+
+        * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h:
+        * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.cpp:
+          Removed these files.
+
 Mon Aug  9 06:42:10 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/ConditionManager_T.h:
diff --git a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp
index 6402411d0af..a5ce38b315f 100644
--- a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp
@@ -34,8 +34,18 @@ namespace CIAO
         {
           this->error_listener_->on_unexpected_status (this->entity_, this->status_kind_);
         }
+      catch (const ::CORBA::Exception& ex)
+        {
+          DDS4CCM_PRINT_CORBA_EXCEPTION (
+                                  DDS4CCM_LOG_LEVEL_ERROR,
+                                  ex,
+                                  "OnUnexpectedStatusHandler::handle_exception");
+        }
       catch (...)
         {
+          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+            "CIAO::DDS4CCM::OnUnexpectedStatusHandler::handle_exception - "
+            "Unexpected exception caught\n"));
         }
       return 0;
     }
@@ -66,8 +76,18 @@ namespace CIAO
         {
           this->csl_->on_requested_incompatible_qos (this->dr_, this->status_);
         }
+      catch (const ::CORBA::Exception& ex)
+        {
+          DDS4CCM_PRINT_CORBA_EXCEPTION (
+                                  DDS4CCM_LOG_LEVEL_ERROR,
+                                  ex,
+                                  "OnRequestedOncompatibleQosHandler::handle_exception");
+        }
       catch (...)
         {
+          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+            "CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler::handle_exception - "
+            "Unexpected exception caught\n"));
         }
       return 0;
     }
@@ -98,8 +118,18 @@ namespace CIAO
         {
           this->csl_->on_sample_rejected (this->dr_, this->status_);
         }
+      catch (const ::CORBA::Exception& ex)
+        {
+          DDS4CCM_PRINT_CORBA_EXCEPTION (
+                                  DDS4CCM_LOG_LEVEL_ERROR,
+                                  ex,
+                                  "OnSampleRejectedHandler::handle_exception");
+        }
       catch (...)
         {
+          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+            "CIAO::DDS4CCM::OnSampleRejectedHandler::handle_exception - "
+            "Unexpected exception caught\n"));
         }
       return 0;
     }
@@ -130,8 +160,18 @@ namespace CIAO
         {
           this->csl_->on_inconsistent_topic (this->tp_, this->status_);
         }
+      catch (const ::CORBA::Exception& ex)
+        {
+          DDS4CCM_PRINT_CORBA_EXCEPTION (
+                                  DDS4CCM_LOG_LEVEL_ERROR,
+                                  ex,
+                                  "OnInconsistentTopicHandler::handle_exception");
+        }
       catch (...)
         {
+          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+            "CIAO::DDS4CCM::OnInconsistentTopicHandler::handle_exception - "
+            "Unexpected exception caught\n"));
         }
       return 0;
     }
@@ -162,8 +202,18 @@ namespace CIAO
         {
           this->csl_->on_offered_deadline_missed (this->dw_, this->status_);
         }
+      catch (const ::CORBA::Exception& ex)
+        {
+          DDS4CCM_PRINT_CORBA_EXCEPTION (
+                                  DDS4CCM_LOG_LEVEL_ERROR,
+                                  ex,
+                                  "OnOfferedDeadlineMissedHandler::handle_exception");
+        }
       catch (...)
         {
+          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+            "CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler::handle_exception - "
+            "Unexpected exception caught\n"));
         }
       return 0;
     }
@@ -194,8 +244,18 @@ namespace CIAO
         {
           this->csl_->on_offered_incompatible_qos (this->dw_, this->status_);
         }
+      catch (const ::CORBA::Exception& ex)
+        {
+          DDS4CCM_PRINT_CORBA_EXCEPTION (
+                                  DDS4CCM_LOG_LEVEL_ERROR,
+                                  ex,
+                                  "OnOfferedIncompatibleQoSHandler::handle_exception");
+        }
       catch (...)
         {
+          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+            "CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler::handle_exception - "
+            "Unexpected exception caught\n"));
         }
       return 0;
     }
@@ -224,8 +284,18 @@ namespace CIAO
         {
           this->psl_->on_requested_deadline_missed (this->dr_, this->status_);
         }
+      catch (const ::CORBA::Exception& ex)
+        {
+          DDS4CCM_PRINT_CORBA_EXCEPTION (
+                                  DDS4CCM_LOG_LEVEL_ERROR,
+                                  ex,
+                                  "OnRequestedDeadlineMissedHandler::handle_exception");
+        }
       catch (...)
         {
+          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+            "CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler::handle_exception - "
+            "Unexpected exception caught\n"));
         }
       return 0;
     }
@@ -254,8 +324,18 @@ namespace CIAO
         {
           this->psl_->on_sample_lost (this->dr_, this->status_);
         }
+      catch (const ::CORBA::Exception& ex)
+        {
+          DDS4CCM_PRINT_CORBA_EXCEPTION (
+                                  DDS4CCM_LOG_LEVEL_ERROR,
+                                  ex,
+                                  "OnSampleLostHandler::handle_exception");
+        }
       catch (...)
         {
+          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+            "CIAO::DDS4CCM::OnSampleLostHandler::handle_exception - "
+            "Unexpected exception caught\n"));
         }
       return 0;
     }
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
index 34a92de67d0..f9ed9184731 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
@@ -255,7 +255,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_com
   catch (const ::CCM_DDS::InternalError &ex)
     {
       DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
                               "DDS_Event_Connector_T::configuration_complete");
       throw ::CORBA::INTERNAL ();
@@ -263,7 +263,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_com
   catch (const ::CORBA::Exception& ex)
     {
       DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ex,
                               "DDS_Event_Connector_T::configuration_complete");
       throw;
@@ -314,7 +314,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_activate (voi
   catch (const ::CCM_DDS::InternalError &ex)
     {
       DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
                               "DDS_Event_Connector_T::ccm_activate");
       throw ::CORBA::INTERNAL ();
@@ -322,7 +322,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_activate (voi
   catch (const ::CORBA::Exception& ex)
     {
       DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ex,
                               "DDS_Event_Connector_T::ccm_activate");
       throw;
@@ -363,7 +363,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_passivate (vo
   catch (const ::CCM_DDS::InternalError &ex)
     {
       DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
                               "DDS_Event_Connector_T::ccm_passivate");
       throw ::CORBA::INTERNAL ();
@@ -371,7 +371,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_passivate (vo
   catch (const ::CORBA::Exception& ex)
     {
       DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ex,
                               "DDS_Event_Connector_T::ccm_passivate");
       throw;
@@ -412,7 +412,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_remove (void)
   catch (const ::CCM_DDS::InternalError &ex)
     {
       DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
                               "DDS_Event_Connector_T::ccm_remove");
       throw ::CORBA::INTERNAL ();
@@ -420,7 +420,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_remove (void)
   catch (const ::CORBA::Exception& ex)
     {
       DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ex,
                               "DDS_Event_Connector_T::ccm_remove");
       throw;
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
index 82f2b4f2069..6fc8f56691c 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
@@ -361,7 +361,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_com
   catch (const ::CCM_DDS::InternalError &ex)
     {
       DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
                               "DDS_State_Connector_T::configuration_complete");
       throw ::CORBA::INTERNAL ();
@@ -369,7 +369,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_com
   catch (const ::CORBA::Exception& ex)
     {
       DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ex,
                               "DDS_State_Connector_T::configuration_complete");
       throw;
@@ -437,7 +437,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_activate (voi
   catch (const ::CCM_DDS::InternalError &ex)
     {
       DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
                               "DDS_State_Connector_T::ccm_activate");
       throw ::CORBA::INTERNAL ();
@@ -445,7 +445,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_activate (voi
   catch (const ::CORBA::Exception& ex)
     {
       DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ex,
                               "DDS_State_Connector_T::ccm_activate");
       throw;
@@ -497,7 +497,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_passivate (vo
   catch (const ::CCM_DDS::InternalError &ex)
     {
       DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
                               "DDS_State_Connector_T::ccm_passivate");
       throw ::CORBA::INTERNAL ();
@@ -505,7 +505,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_passivate (vo
   catch (const ::CORBA::Exception& ex)
     {
       DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ex,
                               "DDS_State_Connector_T::ccm_passivate");
       throw;
@@ -556,7 +556,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_remove (void)
   catch (const ::CCM_DDS::InternalError &ex)
     {
       DDS4CCM_PRINT_INTERNAL_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ::CIAO::DDS4CCM::translate_retcode (ex.error_code),
                               "DDS_State_Connector_T::ccm_remove");
       throw ::CORBA::INTERNAL ();
@@ -564,7 +564,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_remove (void)
   catch (const ::CORBA::Exception& ex)
     {
       DDS4CCM_PRINT_CORBA_EXCEPTION (
-                              1,
+                              DDS4CCM_LOG_LEVEL_ERROR,
                               ex,
                               "DDS_State_Connector_T::ccm_remove");
       throw;
diff --git a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h
index a61c14205e0..079865d07eb 100644
--- a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h
@@ -5,7 +5,7 @@
 #define DATALISTENERCONTROL_T_H_
 
 #include "dds4ccm/idl/dds4ccm_DataListenerControlEC.h"
-#include "dds4ccm/impl/DDS4CCM_LocalObject_T.h"
+#include "dds4ccm/impl/LocalObject_T.h"
 
 #include "ace/Copy_Disabled.h"
 
@@ -16,7 +16,7 @@
 template <typename BASE_TYPE, typename CCM_TYPE>
 class CCM_DDS_DataListenerControl_T
   : public virtual BASE_TYPE,
-    public virtual ::CIAO::DDS4CCM::DDS4CCM_LocalObject_T<CCM_TYPE>,
+    public virtual ::CIAO::DDS4CCM::LocalObject_T<CCM_TYPE>,
     private ACE_Copy_Disabled
 {
 public:
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp
index 1bb5dd5900d..dcde40eb373 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp
@@ -27,8 +27,18 @@ CIAO::DDS4CCM::DataReaderHandler_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::handle_exce
     {
       this->drl_->on_data_available_i (this->dr_.in ());
     }
+  catch (const ::CORBA::Exception& ex)
+    {
+      DDS4CCM_PRINT_CORBA_EXCEPTION (
+                              DDS4CCM_LOG_LEVEL_ERROR,
+                              ex,
+                              "DataReaderHandler_T::handle_exception");
+    }
   catch (...)
     {
+      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+        "CIAO::DDS4CCM::DataReaderHandler_T::handle_exception - "
+        "Unexpected exception caught\n"));
     }
   return 0;
 }
@@ -57,8 +67,18 @@ CIAO::DDS4CCM::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::handle
     {
       this->drl_->on_data_available_i (this->dr_.in ());
     }
+  catch (const ::CORBA::Exception& ex)
+    {
+      DDS4CCM_PRINT_CORBA_EXCEPTION (
+                              DDS4CCM_LOG_LEVEL_ERROR,
+                              ex,
+                              "DataReaderStateHandler_T::handle_exception");
+    }
   catch (...)
     {
+      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+        "CIAO::DDS4CCM::DataReaderStateHandler_T::handle_exception - "
+        "Unexpected exception caught\n"));
     }
   return 0;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.h b/CIAO/connectors/dds4ccm/impl/Getter_T.h
index cbc88713b5d..e4c691d722b 100644
--- a/CIAO/connectors/dds4ccm/impl/Getter_T.h
+++ b/CIAO/connectors/dds4ccm/impl/Getter_T.h
@@ -44,7 +44,7 @@ namespace CIAO
       template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE>
       class Getter_Base_T :
          public virtual CCM_TYPE::getter_type,
-         public virtual DDS4CCM_LocalObject_T<CCM_TYPE>,
+         public virtual LocalObject_T<CCM_TYPE>,
          private virtual ACE_Copy_Disabled
       {
       typedef CIAO::DDS4CCM::CCM_DDS_ReadCondition_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h
index 5969b8dbcc6..070c917ea55 100644
--- a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h
+++ b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h
@@ -10,7 +10,7 @@
 #define INSTANCEHANDLEMANGER_T_H_
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/DDS4CCM_LocalObject_T.h"
+#include "dds4ccm/impl/LocalObject_T.h"
 #include "ace/Copy_Disabled.h"
 
 namespace CIAO
@@ -20,7 +20,7 @@ namespace CIAO
     template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE, DDS4CCM_Vendor VENDOR_TYPE>
     class InstanceHandleManager_T :
       public virtual BASE_TYPE,
-      public virtual DDS4CCM_LocalObject_T<CCM_TYPE>,
+      public virtual LocalObject_T<CCM_TYPE>,
       private virtual ACE_Copy_Disabled
     {
     public:
diff --git a/CIAO/connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.cpp b/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp
index 8673ca6139b..3ae8281912e 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp
@@ -1,25 +1,25 @@
 // $Id$
 
 template <typename CCM_TYPE>
-CIAO::DDS4CCM::DDS4CCM_LocalObject_T<CCM_TYPE>::DDS4CCM_LocalObject_T (void)
+CIAO::DDS4CCM::LocalObject_T<CCM_TYPE>::LocalObject_T (void)
 {
 }
 
 template <typename CCM_TYPE>
-CIAO::DDS4CCM::DDS4CCM_LocalObject_T<CCM_TYPE>::~DDS4CCM_LocalObject_T (void)
+CIAO::DDS4CCM::LocalObject_T<CCM_TYPE>::~LocalObject_T (void)
 {
 }
 
 template <typename CCM_TYPE>
 ::CORBA::Object_ptr
-CIAO::DDS4CCM::DDS4CCM_LocalObject_T<CCM_TYPE>::_get_component (void)
+CIAO::DDS4CCM::LocalObject_T<CCM_TYPE>::_get_component (void)
 {
   return CCM_TYPE::base_type::_duplicate (this->component_.in ());
 }
 
 template <typename CCM_TYPE>
 void
-CIAO::DDS4CCM::DDS4CCM_LocalObject_T<CCM_TYPE>::_set_component (
+CIAO::DDS4CCM::LocalObject_T<CCM_TYPE>::_set_component (
   typename CCM_TYPE::base_type::_ptr_type component)
 {
   this->component_ = CCM_TYPE::base_type::_duplicate (component);
diff --git a/CIAO/connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h b/CIAO/connectors/dds4ccm/impl/LocalObject_T.h
index d12ee2f24fe..b18b651fd2a 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h
+++ b/CIAO/connectors/dds4ccm/impl/LocalObject_T.h
@@ -11,12 +11,12 @@ namespace CIAO
   namespace DDS4CCM
   {
     template <typename CCM_TYPE>
-    class DDS4CCM_LocalObject_T
+    class LocalObject_T
       : public virtual ::CORBA::LocalObject
     {
     public:
-      DDS4CCM_LocalObject_T (void);
-      ~DDS4CCM_LocalObject_T (void);
+      LocalObject_T (void);
+      virtual ~LocalObject_T (void);
 
       void _set_component (typename CCM_TYPE::base_type::_ptr_type component);
       virtual ::CORBA::Object_ptr _get_component (void);
@@ -27,6 +27,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/DDS4CCM_LocalObject_T.cpp"
+#include "dds4ccm/impl/LocalObject_T.cpp"
 
 #endif /* DDS4CCM_LOCALOBJECT_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.h b/CIAO/connectors/dds4ccm/impl/Reader_T.h
index 55c084f72c3..90dafed39e2 100644
--- a/CIAO/connectors/dds4ccm/impl/Reader_T.h
+++ b/CIAO/connectors/dds4ccm/impl/Reader_T.h
@@ -12,7 +12,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/DDS4CCM_LocalObject_T.h"
+#include "dds4ccm/impl/LocalObject_T.h"
 
 #include "dds4ccm/impl/ConditionManager_T.h"
 
@@ -30,7 +30,7 @@ namespace CIAO
       template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
       class Reader_T :
           public virtual CCM_TYPE::reader_type,
-          public virtual DDS4CCM_LocalObject_T<CCM_TYPE>,
+          public virtual LocalObject_T<CCM_TYPE>,
           private virtual ACE_Copy_Disabled
       {
       typedef DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>