diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Concurrency')
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_client.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_command.cpp | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_tests.cpp | 15 |
5 files changed, 2 insertions, 40 deletions
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index 93760c93800..3cd10a0b62b 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -370,7 +370,6 @@ CC_Client::init_naming_service (void) -1); this->naming_service_->Init (this->orb_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -395,7 +394,6 @@ CC_Client::init (int argc, char **argv) this->argv_, "internet" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse command line and verify parameters. if (this->parse_args () == -1) @@ -419,14 +417,12 @@ CC_Client::init (int argc, char **argv) CORBA::Object_var factory_object = this->orb_->string_to_object (this->cc_factory_key_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #if 0 // The test cannot currently run without the naming service. this->factory_ = CosConcurrencyControl::LockSetFactory::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->factory_.in ())) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index fda16fbaa42..0975b4b985a 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -59,12 +59,10 @@ CC_Command::GetLockSet (const char *lock_set_name CC_naming_service::Instance()->get_obj_from_name ("", lock_set_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ccls_ret = CosConcurrencyControl::LockSet::_narrow (ccls_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { @@ -175,7 +173,6 @@ int CC_CreateLockSet_Cmd::execute(void) { CC_naming_service::Instance()->bind_name(name_, lock_set ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { @@ -225,10 +222,8 @@ int CC_Lock_Cmd::execute(void) { CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ccls->lock (mode_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -271,11 +266,9 @@ int CC_UnLock_Cmd::execute(void) ACE_TRY { CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ccls->unlock (mode_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY @@ -321,11 +314,9 @@ int CC_TryLock_Cmd::execute(void) ACE_TRY { CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; lock_not_held = ccls->try_lock (mode_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (lock_not_held) { @@ -386,11 +377,9 @@ int CC_ChangeMode_Cmd::execute(void) ACE_TRY { CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ccls->change_mode (held_mode_, new_mode_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY @@ -583,15 +572,12 @@ CC_Lookup_Cmd::execute(void) CC_naming_service::Instance()->get_obj_from_name ("", name_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosConcurrencyControl::LockSet_var ccls = CosConcurrencyControl::LockSet::_narrow (ccls_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; cc_lockset_ = ccls; - ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp index d12cb0d1e94..79825ac4384 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp @@ -30,7 +30,6 @@ CC_naming_service::CC_naming_service (CORBA::ORB_var orb factory_ (0) { this->Init(orb ACE_ENV_ARG_PARAMETER); - ACE_CHECK; instance_ = this; } @@ -86,7 +85,6 @@ CC_naming_service::get_obj_from_name (const char *c_name, ns_name.length (1); ns_name[0].id = CORBA::string_dup (name); obj = my_name_client_->resolve (ns_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { @@ -95,7 +93,6 @@ CC_naming_service::get_obj_from_name (const char *c_name, ns_name[0].id = CORBA::string_dup (c_name); ns_name[1].id = CORBA::string_dup (name); obj = my_name_client_->resolve (ns_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (CORBA::is_nil (obj.in ()) ) ACE_DEBUG((LM_DEBUG, @@ -127,7 +124,6 @@ CC_naming_service::bind_name (const char *n, my_name_client_->bind (ns_name, obj ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -159,12 +155,10 @@ CC_naming_service::init_naming_service (void) CORBA::Object_var factory_obj = get_obj_from_name ("CosConcurrency", "LockSetFactory" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->factory_ = CosConcurrencyControl::LockSetFactory::_narrow (factory_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->factory_.in ())) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp index f88b2b65f7e..23fdb762071 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp @@ -54,8 +54,7 @@ CC_TestUtils::create_lock_set (void) ACE_TRY { lock_set = - CC_naming_service::Instance()->get_lock_set_factory ()->create (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CC_naming_service::Instance()->get_lock_set_factory ()->create (); if (CORBA::is_nil (lock_set)) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp index 5dfccef2eb5..6b7fb36dc56 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp @@ -43,8 +43,7 @@ CC_Test::create_lock_set (void) ACE_TRY { lock_set = - this->naming_service_->get_lock_set_factory ()->create (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->naming_service_->get_lock_set_factory ()->create (); if (CORBA::is_nil (lock_set)) ACE_ERROR_RETURN ((LM_ERROR, @@ -108,14 +107,12 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */) { cc_lock_set_->lock (mode_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s lock set\n", get_lock_mode_name (mode_))); lock_not_held = cc_lock_set_->try_lock (mode_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (lock_not_held) { @@ -137,7 +134,6 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */) lock_not_held = cc_lock_set_->try_lock (mode_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (lock_not_held) ACE_DEBUG ((LM_DEBUG, @@ -188,14 +184,12 @@ Test_Setup_LockSet::run (int /* times_to_run */) create_lock_set (); this->naming_service_->bind_name (my_name_, cc_lock_set_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Name bound\n")); cc_lock_set_->lock (CosConcurrencyControl::read ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Read lock set\n")); @@ -235,16 +229,13 @@ Test_Use_Already_Created_LockSet::run (int /* times_to_run */) this->naming_service_->get_obj_from_name (const_cast<char *> (""), my_name_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosConcurrencyControl::LockSet_var ccls = CosConcurrencyControl::LockSet::_narrow (ccls_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ccls->lock (CosConcurrencyControl::read ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY @@ -281,12 +272,10 @@ Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */) CORBA::Object_var ccls_obj = this->naming_service_->get_obj_from_name (const_cast<char *> (""), my_name_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosConcurrencyControl::LockSet_var ccls = CosConcurrencyControl::LockSet::_narrow (ccls_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ccls->unlock (CosConcurrencyControl::read ACE_ENV_ARG_PARAMETER); @@ -327,7 +316,6 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */) { // lock the lock cc_lock_set_->lock (mode_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s lock set\n", @@ -364,7 +352,6 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */) "attemptet to release %s lock\n", get_lock_mode_name (mode_))); - ACE_TRY_CHECK; } ACE_CATCH(CosConcurrencyControl::LockNotHeld, userex) { |