1 files changed, 32 insertions, 54 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index 62fad4ef9d7..e215955c4d5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -30,33 +30,27 @@ TAO_FTEC_ProxyPushSupplier::id() const
     /// Activate in the POA
 void
 TAO_FTEC_ProxyPushSupplier::activate (
-       RtecEventChannelAdmin::ProxyPushSupplier_ptr &result
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::ProxyPushSupplier_ptr &result)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   result =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil();
-  ACE_TRY {
-    object_id_ = Request_Context_Repository().get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    PortableServer::POA_var poa = _default_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    activate_object_with_id(result, poa.in(), this, id() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    object_id_ = Request_Context_Repository().get_object_id();
+    PortableServer::POA_var poa = _default_POA();
+    activate_object_with_id(result, poa.in(), this, id());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     // ignore exceptions
   }
-  ACE_ENDTRY;
 }
 
     // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
 void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError))
@@ -71,26 +65,22 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
   param.qos = qos;
   update.param.connect_consumer_param(param);
 
-  Inherited::connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Inherited::connect_push_consumer(push_consumer, qos);
 
-  ACE_TRY {
+  try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
 
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-      &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier);
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 }
 
 
-void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
@@ -100,18 +90,16 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DE
   update.object_id = id();
   update.param._d(FtRtecEventChannelAdmin::DISCONNECT_PUSH_SUPPLIER);
 
-  Inherited::disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Inherited::disconnect_push_supplier();
   FTRTEC::Replication_Service *svc = FTRTEC::Replication_Service::instance();
 
   ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
-  svc->replicate_request(update, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  svc->replicate_request(update, 0);
 }
 
 
-void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::suspend_connection (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
@@ -121,55 +109,47 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
   update.object_id = id();
   update.param._d(FtRtecEventChannelAdmin::SUSPEND_CONNECTION);
 
-  Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Inherited::suspend_connection();
 
-  ACE_TRY
+  try
   {
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-      &FtRtecEventChannelAdmin::EventChannelFacade::resume_push_supplier
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      &FtRtecEventChannelAdmin::EventChannelFacade::resume_push_supplier);
   }
-  ACE_CATCHALL {
-    this->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_RE_THROW;
+  catch (...){
+    this->resume_connection();
+    throw;
   }
-  ACE_ENDTRY;
 }
 
-void TAO_FTEC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::resume_connection (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
     return;
 
-  Request_Context_Repository().set_object_id(id() ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().set_object_id(id());
   FtRtecEventChannelAdmin::Operation update;
   update.object_id = id();
   update.param._d(FtRtecEventChannelAdmin::RESUME_CONNECTION);
 
-  Inherited::resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Inherited::resume_connection();
 
-  ACE_TRY {
+  try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
 
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-      &FtRtecEventChannelAdmin::EventChannelFacade::suspend_push_supplier
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      &FtRtecEventChannelAdmin::EventChannelFacade::suspend_push_supplier);
   }
-  ACE_CATCHALL {
-    this->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_RE_THROW;
+  catch (...){
+    this->suspend_connection();
+    throw;
   }
-  ACE_ENDTRY;
 }
 
 
@@ -186,16 +166,14 @@ void TAO_FTEC_ProxyPushSupplier::get_state(FtRtecEventChannelAdmin::ProxyPushSup
 }
 
 
-void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state
-                                           ACE_ENV_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state)
 {
   if (!CORBA::is_nil(state.parameter.info().push_consumer.in()))
   {
     Inherited::connect_push_consumer(state.parameter.info().push_consumer.in(),
-      state.parameter.info().qos
-      ACE_ENV_ARG_PARAMETER);
+      state.parameter.info().qos);
     if (state.suspended)
-      Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
+      Inherited::suspend_connection();
   }
 }