diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
| commit | c801f87e59c00f72bdeb5ce7bd0d276674665bac (patch) | |
| tree | 70bff03d1cf156ecf05ee4c5c338d8ce423e64ee /TAO/tests/AMI_Timeouts/timeout_client.cpp | |
| parent | 98c0b37d4714ff774fc3ada8c9ee893c719af714 (diff) | |
| download | ATCD-c801f87e59c00f72bdeb5ce7bd0d276674665bac.tar.gz | |
Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/AMI_Timeouts/timeout_client.cpp')
| -rw-r--r-- | TAO/tests/AMI_Timeouts/timeout_client.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp index 96322b4cf1d..5915ee346e6 100644 --- a/TAO/tests/AMI_Timeouts/timeout_client.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp @@ -64,15 +64,13 @@ TimeoutClient::svc () this->none_test (); // shut down remote ORB - timeoutObject_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + timeoutObject_->shutdown (); ACE_Time_Value tv (0, 20); // wait for the ORB to deliver the shutdonw ACE_OS::sleep (tv); // shut down local ORB orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -96,11 +94,9 @@ TimeoutClient::initialize () CORBA::Object_var object = orb_->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_manager_ = CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -193,14 +189,13 @@ TimeoutClient::send (CORBA::Boolean async, } ACE_ENDTRY; - ACE_CHECK; // get rid of the policy, you created before. ACE_TRY_EX (cleanup) { if (local_timeout != 0) { - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + policy_list[0]->destroy (); ACE_TRY_CHECK_EX (cleanup); } } @@ -210,7 +205,6 @@ TimeoutClient::send (CORBA::Boolean async, "Error: Unexpected exception\n\n")); } ACE_ENDTRY; - ACE_CHECK; // wait for responses ACE_Time_Value tv (0, (local_timeout + remote_sleep)*2000 + 4000); |