summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-10-17 07:38:25 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-10-17 07:38:25 +0000
commit939bcad005305444ca19372fba136007531ee0c9 (patch)
tree94df81fcfbd627be8d2c9f2b87f4b58c73354d35
parent5cbce50aa988e08fa47ff1d0fd4c8610ff0887a9 (diff)
downloadATCD-939bcad005305444ca19372fba136007531ee0c9.tar.gz
ChangeLogTag: Fri Oct 17 07:37:15 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp2
7 files changed, 16 insertions, 9 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 2dddd3bd7f6..94c90dfcfcc 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -112,7 +112,8 @@ AMI_Primary_Replication_Strategy::replicate_request(
bool success;
FTRT::TransactionDepth transaction_depth =
- Request_Context_Repository().get_transaction_depth();
+ Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
const FtRtecEventChannelAdmin::EventChannelList& backups =
GroupInfoPublisher::instance()->backups();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index be2dd12f747..d6e7272c605 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -245,13 +245,13 @@ CORBA::Boolean
TAO_FTEC_Event_Channel::start (
FTRT::FaultListener_ptr listener,
FTRT::Location_out location
- ACE_ENV_ARG_DECL_NOT_USED
+ ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return ec_impl_->start(listener, location);
+ return ec_impl_->start(listener, location ACE_ENV_ARG_PARAMETER);
}
void
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 b053159892f..96bdb8dc521 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -301,7 +301,8 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer (
)
{
CORBA::Any_var any
- = Request_Context_Repository().get_cached_result();
+ = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK_RETURN(0);
FtRtecEventChannelAdmin::ObjectId *oid;
@@ -340,7 +341,8 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
)
{
CORBA::Any_var any
- = Request_Context_Repository().get_cached_result();
+ = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK_RETURN(0);
FtRtecEventChannelAdmin::ObjectId *oid;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index 1e14a103639..e20def92cab 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -35,7 +35,8 @@ TAO_FTEC_ProxyPushConsumer::activate (
{
result = RtecEventChannelAdmin::ProxyPushConsumer::_nil();
ACE_TRY {
- object_id_ = Request_Context_Repository().get_object_id();
+ 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, object_id_ ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index 1e6480808cd..20efd3f7244 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -36,7 +36,8 @@ TAO_FTEC_ProxyPushSupplier::activate (
result =
RtecEventChannelAdmin::ProxyPushSupplier::_nil();
ACE_TRY {
- object_id_ = Request_Context_Repository().get_object_id();
+ 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);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index ad3638fa1e9..70c495471ec 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -51,7 +51,9 @@ template <class EC_PROXY_ADMIN, class Proxy,
typename FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::ProxyInterface_ptr
FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_ENV_SINGLE_ARG_DECL)
{
- CORBA::Any_var any = Request_Context_Repository().get_cached_result();
+ CORBA::Any_var any = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK_RETURN(0);
+
CORBA::Object_var obj;
if (*any >>= CORBA::Any::to_object(obj))
return ProxyInterface::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
index 30f23c60bef..0501abb2557 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
@@ -19,7 +19,7 @@ Replication_Strategy::~Replication_Strategy()
void
-Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL)
+Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
{
}