1 files changed, 13 insertions, 14 deletions

diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index d48cbe24c4e..7f728049d8a 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -47,18 +47,17 @@ Test_Bounded_Long_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req,
-                                            CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
 Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr objref,
-                                             CORBA::Environment &ACE_TRY_ENV)
+                                             CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (objref);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 
   // get some sequence length (32 in this case)
   CORBA::ULong len = this->in_->maximum ();
@@ -85,20 +84,20 @@ Test_Bounded_Long_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          CORBA::Environment &env)
 {
   Param_Test::Bounded_Long_Seq_out out (this->out_.out ());
   this->ret_ = objref->test_bounded_long_sequence (this->in_.in (),
                                                    this->inout_.inout (),
                                                    out,
-                                                   ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                                   env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Bounded_Long_Sequence::add_args (CORBA::NVList_ptr param_list,
                                        CORBA::NVList_ptr retval,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Bounded_Long_Seq,
                      (void *) &this->in_.in (),
@@ -116,23 +115,23 @@ Test_Bounded_Long_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Bounded_Long_Seq,
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Bounded_Long_Seq,
                                             &this->ret_.inout (), // see above
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }