summaryrefslogtreecommitdiff
path: root/TAO/tests/Client_Leaks/Process_Factory.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-01-24 15:39:09 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-01-24 15:39:09 +0000
commitc801f87e59c00f72bdeb5ce7bd0d276674665bac (patch)
tree70bff03d1cf156ecf05ee4c5c338d8ce423e64ee /TAO/tests/Client_Leaks/Process_Factory.cpp
parent98c0b37d4714ff774fc3ada8c9ee893c719af714 (diff)
downloadATCD-c801f87e59c00f72bdeb5ce7bd0d276674665bac.tar.gz
Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/Client_Leaks/Process_Factory.cpp')
-rw-r--r--TAO/tests/Client_Leaks/Process_Factory.cpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index f1039150d26..7e474c5fb29 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -20,24 +20,21 @@ Process_Factory::shutdown_received (void)
}
Test::Process_ptr
-Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL)
+Process_Factory::create_new_process (void)
ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed))
{
Startup_Callback *startup_callback_impl;
ACE_NEW_THROW_EX (startup_callback_impl,
Startup_Callback,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (Test::Process::_nil ());
PortableServer::ServantBase_var owner_transfer(startup_callback_impl);
Test::Startup_Callback_var startup_callback =
- startup_callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (Test::Process::_nil ());
+ startup_callback_impl->_this ();
CORBA::String_var ior =
this->orb_->object_to_string (startup_callback.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (Test::Process::_nil ());
const char* argv[3] = {
"child",
@@ -69,7 +66,6 @@ Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_Time_Value interval (0, 10000);
this->orb_->perform_work (interval ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (Test::Process::_nil ());
process_has_started =
startup_callback_impl->process_has_started (the_process.out ());
@@ -78,13 +74,10 @@ Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
PortableServer::POA_var poa =
- startup_callback_impl->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ startup_callback_impl->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (startup_callback_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -104,13 +97,13 @@ Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Process_Factory::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Process_Factory::noop (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
void
-Process_Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Process_Factory::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->shutdown_received_ = 1;