ChangeLogTag: Wed Oct 15 15:03:32 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 42 insertions, 33 deletions

diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index f6153df1220..14855d5de9a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -142,10 +142,10 @@ TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       if (CORBA::is_nil (typed_consumer.in ()))
         return;
 
-      ACE_TRY
+      ACE_TRY_EX (typed)
         {
           typed_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ACE_TRY_CHECK_EX (typed);
         }
       ACE_CATCHANY
         {
@@ -154,7 +154,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
         }
       ACE_ENDTRY;
     } /* this->is_typed_ec */
-  else 
+  else
     {
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
@@ -355,13 +355,13 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
         // declared and obtained before the Guard to avoid deadlock during the
         // _is_a (during _narrow) and get_typed_consumer invocations.
         // They are eventually assigned onto this object inside the Guard.
-        CosTypedEventComm::TypedPushConsumer_var local_typed_consumer = 
+        CosTypedEventComm::TypedPushConsumer_var local_typed_consumer =
           CosTypedEventComm::TypedPushConsumer::_narrow (push_consumer
                                                          ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         // Obtain the typed object interface from the consumer
-        CORBA::Object_var local_typed_consumer_obj = 
+        CORBA::Object_var local_typed_consumer_obj =
           CORBA::Object::_duplicate (local_typed_consumer->get_typed_consumer (
                                              ACE_ENV_SINGLE_ARG_PARAMETER) );
         ACE_CHECK;
@@ -373,7 +373,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          if (this->is_connected_i ())   
+          if (this->is_connected_i ())
             {
               if (this->typed_event_channel_->consumer_reconnect () == 0)
                 ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
@@ -401,12 +401,12 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
 
             }
 
-          this->typed_consumer_ = 
+          this->typed_consumer_ =
             CosTypedEventComm::TypedPushConsumer::_duplicate (local_typed_consumer.in () );
           ACE_CHECK;
 
           // Store the typed object interface from the consumer
-          this->typed_consumer_obj_ = 
+          this->typed_consumer_obj_ =
             CORBA::Object::_duplicate (local_typed_consumer_obj.in () );
           ACE_CHECK;
         }
@@ -530,10 +530,10 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
     {
       if (this->typed_event_channel_->disconnect_callbacks ())
         {
-          ACE_TRY
+          ACE_TRY_EX (typed)
             {
               typed_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              ACE_TRY_CHECK_EX (typed);
             }
           ACE_CATCHANY
             {
@@ -689,7 +689,7 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
       CORBA::Object::_duplicate (this->typed_consumer_obj_.in ());
   }
 
-  // Create the DII request 
+  // Create the DII request
   ACE_TRY
     {
       typed_consumer_obj_->_create_request (0, // ctx
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index 01c2f4fd1e9..caba8ab004f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -18,7 +18,7 @@ TAO_CEC_TypedConsumerAdmin::TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChanne
   this->default_POA_ =
     this->typed_event_channel_->typed_consumer_poa ();
 }
-  
+
 // Implementation skeleton destructor
 TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin (void)
 {
@@ -67,6 +67,7 @@ TAO_CEC_TypedConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier (
     const char * /*supported_interface*/
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -76,10 +77,11 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier (
 {
   ACE_THROW (CosTypedEventChannelAdmin::InterfaceNotSupported ());
 }
-  
+
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
     const char * uses_interface
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -88,7 +90,7 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
 
 {
   // Register the consumer uses_interface with the EC
-  int result = this->typed_event_channel_->consumer_register_uses_interace (uses_interface ACE_ENV_ARG_DECL);
+  int result = this->typed_event_channel_->consumer_register_uses_interace (uses_interface ACE_ENV_ARG_PARAMETER);
 
   if (result == -1)
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index 1b933ea3d1d..5c943a8d301 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -63,11 +63,11 @@ public:
 
   // = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_typed_push_supplier (const char * uses_interface)
+    obtain_typed_push_supplier (const char * uses_interface ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::NoSuchImplementation));
   virtual CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr
-    obtain_typed_pull_supplier (const char * supported_interface)
+    obtain_typed_pull_supplier (const char * supported_interface ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::InterfaceNotSupported));
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index e411af37849..05feab2c306 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -416,7 +416,9 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int
   else
     {
       // Neither a consumer nor a supplier has connected yet
-      int result = cache_interface_description (uses_interface_);
+      int result = cache_interface_description (uses_interface_ ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
+
       if (result == 0)
         {
           this->uses_interface_ = uses_interface_;
@@ -478,7 +480,9 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su
   else
     {
       // Neither a consumer nor a supplier has connected yet
-      int result = cache_interface_description (supported_interface_);
+      int result = cache_interface_description (supported_interface_ ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
+
       if (result == 0)
         {
           this->supported_interface_ = supported_interface_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 3e07e5e198e..d9aefc5817d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -107,17 +107,16 @@ class TAO_Event_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTypedEv
 public:
 
   /**
-   * constructor
+   * Constructor
    * If <own_factory> is not 0 it assumes ownership of the factory.
    * If the factory is <nil> it uses the Service_Configurator to load
    * the Factory, if not found it uses TAO_CEC_Default_Resource_Factory
    */
-  //Constructor
   TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attributes,
                              TAO_CEC_Factory* factory = 0,
                              int own_factory = 0);
 
-  //Destructor
+  /// Destructor
   virtual ~TAO_CEC_TypedEventChannel (void);
 
   /// Start the internal threads (if any), etc.
@@ -205,7 +204,7 @@ public:
   typedef ACE_Hash_Map_Manager_Ex<const char *, TAO_CEC_Operation_Params *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> InterfaceDescription;
   typedef InterfaceDescription::iterator Iterator;
 
-  // Finds a operation/parameter from the IFR cache
+  /// Finds a operation/parameter from the IFR cache
   TAO_CEC_Operation_Params * find_from_ifr_cache (const char *operation);
 
   /// Function allows consumer admin to register the uses interface
@@ -246,13 +245,13 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  // Function caches the full interface description from the IFR
+  /// Function caches the full interface description from the IFR
   int cache_interface_description (const char *interface ACE_ENV_ARG_DECL);
 
-  // Insert a operation/parameter into the IFR cache
+  /// Insert a operation/parameter into the IFR cache
   int insert_into_ifr_cache (const char *operation, TAO_CEC_Operation_Params *parameters);
 
-  // Function clears the IFR cache
+  /// Function clears the IFR cache
   int clear_ifr_cache (void);
 
 private:
@@ -321,10 +320,10 @@ private:
 class TAO_Event_Export TAO_CEC_Param
 {
 public:
-  /// constructor
+  /// Constructor
   TAO_CEC_Param (void);
 
-  /// destructor
+  /// Destructor
   ~TAO_CEC_Param (void);
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index 95a54d4cc0d..224e687c698 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -116,7 +116,7 @@ private:
   /// The typed supplier....
   CosEventComm::PushSupplier_var typed_supplier_;
 
-  // The DSI impl
+  /// The DSI impl
   TAO_CEC_DynamicImplementationServer* dsi_impl_;
 
   /// The DSI Portable Server OID
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index 69ff0cc5ff1..9f488611cae 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -18,7 +18,7 @@ TAO_CEC_TypedSupplierAdmin::TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChanne
   this->default_POA_ =
     this->typed_event_channel_->typed_supplier_poa ();
 }
-  
+
 // Implementation skeleton destructor
 TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin (void)
 {
@@ -61,6 +61,7 @@ TAO_CEC_TypedSupplierAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
     const char * supported_interface
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -68,7 +69,7 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
   ))
 
 {
-  int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface);
+  int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface ACE_ENV_ARG_PARAMETER);
 
   if (result == -1)
     {
@@ -77,10 +78,11 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
 
   return this->typed_push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
-  
+
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer (
     const char * /* uses_interface */
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index b04010c2cdd..b987261b037 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -57,12 +57,14 @@ public:
 
   // = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods...
   virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
-    obtain_typed_push_consumer (const char * supported_interface)
+    obtain_typed_push_consumer (const char * supported_interface
+                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::InterfaceNotSupported));
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_typed_pull_consumer (const char * uses_interface)
+    obtain_typed_pull_consumer (const char * uses_interface
+                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::NoSuchImplementation));