1 files changed, 6 insertions, 18 deletions

diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 2b6a232470a..efe47235d4f 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -43,8 +43,7 @@ no_factory (OBV_FactoryTest::Test_ptr test)
       // Calling this without a factory registred should give a marshal
       // exception with minor code 1
       OBV_FactoryTest::BaseValue_var base_value =
-        test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_base_value ();
     }
   ACE_CATCH (CORBA::MARSHAL, ex)
     {
@@ -74,7 +73,6 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -82,11 +80,9 @@ main (int argc, char *argv[])
       // Obtain reference to the object
       CORBA::Object_var tmp =
         orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       OBV_FactoryTest::Test_var test =
         OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -110,7 +106,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (base_factory->tao_repository_id (),
                                    base_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       base_factory->_remove_ref (); // release ownership
 
       OBV_FactoryTest::Value1_init *value1_factory = 0;
@@ -121,7 +116,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (value1_factory->tao_repository_id (),
                                    value1_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value1_factory->_remove_ref ();
 
       OBV_FactoryTest::Value2_init *value2_factory = 0;
@@ -132,22 +126,18 @@ main (int argc, char *argv[])
       orb->register_value_factory (value2_factory->tao_repository_id (),
                                    value2_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value2_factory->_remove_ref ();
 
       // Now perform the test. I don't check return values.
       // I just hope to get MARSHAL.
       OBV_FactoryTest::BaseValue_var base_value =
-        test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_base_value ();
 
       OBV_FactoryTest::Value1_var value1 =
-        test->get_value1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_value1 ();
 
       OBV_FactoryTest::Value2_var value2 =
-        test->get_value2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_value2 ();
 
       // Test factories.
 
@@ -160,11 +150,9 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {