diff options
Diffstat (limited to 'TAO/tests/RTCORBA/Server_Declared/client.cpp')
| -rw-r--r-- | TAO/tests/RTCORBA/Server_Declared/client.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp index 9ac3ce834d6..9ad9778c388 100644 --- a/TAO/tests/RTCORBA/Server_Declared/client.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp @@ -55,25 +55,22 @@ check_policy (Test_ptr server CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); RTCORBA::PriorityModelPolicy_var priority_policy = RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1) return -1; RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + priority_policy->priority_model (); if (priority_model != RTCORBA::SERVER_DECLARED) ACE_ERROR_RETURN ((LM_ERROR, "ERROR: priority_model != " "RTCORBA::SERVER_DECLARED!\n"), -1); - return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); + return priority_policy->server_priority (); } int @@ -86,7 +83,6 @@ main (int argc, char *argv[]) // ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse arguments. if (parse_args (argc, argv) != 0) @@ -95,19 +91,15 @@ main (int argc, char *argv[]) // Test object 1. CORBA::Object_var object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (server1.in (), "server1") == -1) return -1; // Test object 2. object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (check_for_nil (server2.in (), "server2") == -1) return -1; @@ -117,7 +109,6 @@ main (int argc, char *argv[]) // Test object 1. CORBA::Short server1_priority = check_policy (server1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (server1_priority == -1) return -1; @@ -125,7 +116,6 @@ main (int argc, char *argv[]) // Test object 2. CORBA::Short server2_priority = check_policy (server2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (server2_priority == -1) return -1; @@ -133,15 +123,12 @@ main (int argc, char *argv[]) for (int i = 0; i < 5; ++i) { server1->test_method (server1_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; server2->test_method (server2_priority ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } // Testing over. Shut down Server ORB. - server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server1->shutdown (); } ACE_CATCHANY |