ChangeLogTag: Thu Oct 16 08:03:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 30 insertions, 20 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
index 07aad98ce30..326333d5097 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -41,9 +41,9 @@ int  AMI_Primary_Replication_Strategy::release (void)
 }
 
 
-int AMI_Primary_Replication_Strategy::init(ACE_ENV_SINGLE_ARG_DECL)
+int AMI_Primary_Replication_Strategy::init()
 {
-    return this->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->activate();
 }
 
 int AMI_Primary_Replication_Strategy::svc()
@@ -127,7 +127,9 @@ AMI_Primary_Replication_Strategy::replicate_request(
                     CORBA::NO_MEMORY());
 
 
-   Request_Context_Repository().set_transaction_depth(0);
+   Request_Context_Repository().set_transaction_depth(0 ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+
    for (size_t i = 0; i < num_backups; ++i)  {
        ACE_TRY_NEW_ENV {
          PortableServer::ObjectId oid;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index edc5424edbc..826d60f2b7d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -17,7 +17,9 @@ Basic_Replication_Strategy::Basic_Replication_Strategy()
 void
 Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL)
 {
-    FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number();
+    FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
+
     ACE_DEBUG((LM_DEBUG, "check_validity : sequence no = %d\n", sequence_num_));
 
     if (this->sequence_num_ == 0) {
@@ -48,8 +50,9 @@ Basic_Replication_Strategy::replicate_request(
   ACE_UNUSED_ARG(rollback);
   ACE_UNUSED_ARG(oid);
 
-    FTRT::TransactionDepth transaction_depth =
-      Request_Context_Repository().get_transaction_depth();
+  FTRT::TransactionDepth transaction_depth =
+    Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
   GroupInfoPublisherBase * info_publisher = GroupInfoPublisher::instance();
   FtRtecEventChannelAdmin::EventChannel_var successor = info_publisher->successor();
@@ -62,7 +65,8 @@ Basic_Replication_Strategy::replicate_request(
       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    Request_Context_Repository().set_transaction_depth(transaction_depth-1);
+    Request_Context_Repository().set_transaction_depth(transaction_depth-1 ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
 
     if (transaction_depth > 1) {
       successor->set_update(state
@@ -72,6 +76,7 @@ Basic_Replication_Strategy::replicate_request(
       ACE_TRY {
         successor->oneway_set_update(state
           ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
       }
       ACE_CATCHANY {
       }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index 52971b9304e..07160e02261 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -50,7 +50,7 @@ public:
    *
    */
   FtRtecEventChannelAdmin::EventChannel_ptr
-    activate(MEMBERSHIP membership ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    activate(MEMBERSHIP membership ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Registers a listener to accept the notication when this object
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index 6b35312b2aa..5fbadc3181e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -465,19 +465,20 @@ void TAO_FTEC_Event_Channel_Impl::push (
 
 void TAO_FTEC_Event_Channel_Impl::get_state (
                                         FtRtecEventChannelAdmin::EventChannelState & state
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+                                        ACE_ENV_ARG_DECL
                                         )
 {
   FtEventServiceInterceptor::instance()->get_state(state.cached_operation_results);
-  this->supplier_admin()->get_state(state.supplier_admin_state);
-  this->consumer_admin()->get_state(state.consumer_admin_state);
+  this->supplier_admin()->get_state(state.supplier_admin_state ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  this->consumer_admin()->get_state(state.consumer_admin_state ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 
 
 void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+                                             ACE_ENV_ARG_DECL)
 {
   FtRtecEventChannelAdmin::EventChannelState state;
 
@@ -485,8 +486,10 @@ void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat
   cdr >> state;
 
   FtEventServiceInterceptor::instance()->set_state(state.cached_operation_results);
-  this->supplier_admin()->set_state(state.supplier_admin_state);
-  this->consumer_admin()->set_state(state.consumer_admin_state);
+  this->supplier_admin()->set_state(state.supplier_admin_state ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  this->consumer_admin()->set_state(state.consumer_admin_state ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 
@@ -494,7 +497,7 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s
                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate))
 {
-  FTRTEC::Replication_Service::instance()->check_validity(ACE_ENV_ARG_PARAMETER);
+  FTRTEC::Replication_Service::instance()->check_validity(ACE_ENV_SINGLE_ARG_PARAMETER);
 
   if (!Request_Context_Repository().is_executed_request()) {
     TAO_InputCDR cdr((const char*)s.get_buffer(), s.length());
@@ -528,8 +531,8 @@ TAO_FTEC_ProxyPushSupplier*
 TAO_FTEC_Event_Channel_Impl::find_proxy_push_supplier(const PortableServer::ObjectId& id)
 {
   ACE_TRY_NEW_ENV {
-    PortableServer::POA_var poa= consumer_poa(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    PortableServer::POA_var poa = consumer_poa();
+
     PortableServer::Servant servant = poa->id_to_servant(id
       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN(0);
@@ -551,8 +554,8 @@ TAO_FTEC_ProxyPushConsumer*
 TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const PortableServer::ObjectId& id)
 {
   ACE_TRY_NEW_ENV {
-    PortableServer::POA_var poa= supplier_poa(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    PortableServer::POA_var poa= supplier_poa();
+
     PortableServer::Servant servant = poa->id_to_servant(id
       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN(0);