1 files changed, 43 insertions, 76 deletions

diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index ae767374b25..7ff4fdea85f 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -47,7 +47,7 @@ Test_ULongLong::dii_req_invoke (CORBA::Request *req,
 
 int
 Test_ULongLong::init_parameters (Param_Test_ptr ,
-                                 CORBA::Environment &)
+                                CORBA::Environment &)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -69,25 +69,12 @@ int
 Test_ULongLong::run_sii_test (Param_Test_ptr objref,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->ret_ = objref->test_ulonglong (this->in_,
-                                           this->inout_,
-                                           this->out_,
-                                           ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ULongLong::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  this->ret_ = objref->test_ulonglong (this->in_,
+                                       this->inout_,
+                                       this->out_,
+                                       ACE_TRY_ENV);
+
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -95,62 +82,42 @@ Test_ULongLong::add_args (CORBA::NVList_ptr param_list,
                           CORBA::NVList_ptr retval,
                           CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      // we provide top level memory to the ORB to retrieve the data
-      CORBA::Any in_arg (CORBA::_tc_ulonglong,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (CORBA::_tc_ulonglong,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (CORBA::_tc_ulonglong,
-                          &this->out_,
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value. Let the ORB allocate storage. We simply tell the ORB
-      // what type we are expecting.
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (CORBA::_tc_ulonglong,
-                               &this->ret_,
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ULongLong::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  // we provide top level memory to the ORB to retrieve the data
+  CORBA::Any in_arg (CORBA::_tc_ulonglong,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (CORBA::_tc_ulonglong,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (CORBA::_tc_ulonglong,
+                      &this->out_,
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value. Let the ORB allocate storage. We simply tell the ORB
+  // what type we are expecting.
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_ulonglong,
+                                            &this->ret_,
+                                            0, // does not own
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean