1 files changed, 1 insertions, 14 deletions

diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index c89d3699c52..00634d96afc 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -160,7 +160,6 @@ int svc(void) {
       CORBA::Object_var obj =
         orb_->string_to_object ("file://server.ior"
                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
 
       if (CORBA::is_nil (obj.in ()))
@@ -173,7 +172,6 @@ int svc(void) {
 
       testSched::Object1_var object1 =
         testSched::Object1::_narrow (obj.in ()ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
 
       if (CORBA::is_nil (object1.in ()))
@@ -195,7 +193,6 @@ int svc(void) {
                              node_,
                              file_),
                            CORBA::NO_MEMORY());
-          ACE_TRY_CHECK;
 
 
           // Check to see that the ClientScheduler started correctly
@@ -211,22 +208,18 @@ int svc(void) {
           /// Create a Current object so we can check on the priority locally
           obj = orb_->resolve_initial_references ("RTCurrent"
                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
           RTCORBA::Current_var current =
             RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
 
           /// Test to make sure the priority model is exposed
           CORBA::Policy_var policy =
             object1->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           RTCORBA::PriorityModelPolicy_var priority_policy =
             RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
                                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           if (CORBA::is_nil (priority_policy.in ()))
             {
@@ -237,8 +230,7 @@ int svc(void) {
 
           /// Test to make sure we are using Server Declared Priority model
           RTCORBA::PriorityModel priority_model =
-            priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            priority_policy->priority_model ();
 
           if (priority_model != RTCORBA::SERVER_DECLARED)
             {
@@ -275,7 +267,6 @@ int svc(void) {
           ACE_OS::strcat(client_output_, buf);
 
           do_work(before_);
-          ACE_TRY_CHECK;
 
 
           ACE_OS::sprintf(buf,
@@ -324,7 +315,6 @@ int svc(void) {
                      "%T\t%s\tClient\tBeginning Activity\n",
                      activity_));
           do_work(before_);
-          ACE_TRY_CHECK;
           ACE_DEBUG ((LM_DEBUG,
                       "%T\t%s\tClient\tCalling method1\n",
                       activity_));
@@ -381,7 +371,6 @@ ACE_TMAIN (int argc, char * argv[])
     {
     CORBA::ORB_var orb =
     CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     ORB_Thread ot(orb, argc, argv);
 
@@ -395,12 +384,10 @@ ACE_TMAIN (int argc, char * argv[])
 || (TAO_MAJOR_VERSION==1 && TAO_MAJOR_VERSION==3 && TAO_MINOR_VERSION > 1)
 
     orb->orb_core ()->orb_params ()->thread_creation_flags ();
-    ACE_TRY_CHECK;
 
 #else /* TAO version is 1.3.1 or lower */
     orb->orb_core ()->orb_params ()->scope_policy () |
     orb->orb_core ()->orb_params ()->sched_policy ();
-    ACE_TRY_CHECK;
 #endif
 
     ot.activate(flags);