1 files changed, 9 insertions, 24 deletions

diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index 10146a9a882..989aca924bf 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -27,7 +27,6 @@ Ptest::init (int argc,
                                     argv,
                                     0
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int retval = this->parse_args (argc,
                                      argv);
@@ -38,7 +37,6 @@ Ptest::init (int argc,
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("InterfaceRepository"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -53,7 +51,6 @@ Ptest::init (int argc,
       this->repo_ =
         CORBA::Repository::_narrow (object.in ()
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->repo_.in ()))
         {
@@ -81,13 +78,11 @@ Ptest::run (void)
     {
       if (this->query_ == 1)
         {
-          this->query (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->query ();
         }
       else
         {
-          this->populate (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->populate ();
         }
     }
   ACE_CATCHANY
@@ -132,7 +127,7 @@ Ptest::parse_args (int argc,
 }
 
 void
-Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
+Ptest::populate (void)
 {
   if (this->debug_)
     {
@@ -147,17 +142,13 @@ Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
   members[0].name = CORBA::string_dup ("long_mem");
   members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  members[0].type = members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  members[0].type = members[0].type_def->type ();
 
   members[1].name = CORBA::string_dup ("array_mem");
   members[1].type_def = this->repo_->create_array (5,
                                                    members[0].type_def.in ()
                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  members[1].type = members[1].type_def->type ();
 
 
   CORBA::StructDef_var svar = this->repo_->create_struct ("IDL:my_struct:1.0",
@@ -165,7 +156,6 @@ Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
                                                           "1.0",
                                                           members
                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::EnumMemberSeq def_members (2);
   def_members.length (2);
@@ -178,11 +168,10 @@ Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
                                                     "1.0",
                                                     def_members
                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
+Ptest::query (void)
 {
   if (this->debug_)
     {
@@ -199,11 +188,10 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
     "my_enum"
   };
 
-  CORBA::ContainedSeq_var contents = 
+  CORBA::ContainedSeq_var contents =
     this->repo_->contents (CORBA::dk_all,
                            0
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::ULong length = contents->length ();
 
@@ -221,13 +209,11 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::StructDef_var svar =
     CORBA::StructDef::_narrow (contents[i]
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (svar.in ()));
 
   CORBA::StructMemberSeq_var out_members =
-    svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    svar->members ();
 
   length = out_members->length ();
 
@@ -265,6 +251,5 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
   ACE_UNUSED_ARG (members);
 #endif /* ACE_NDEBUG */
 
-  svar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  svar->destroy ();
 }