Fixd ACE_TRY stuff.

1 files changed, 75 insertions, 42 deletions

diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index cb96fda5e22..0868c0d092f 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -176,12 +176,27 @@ int
 Test_AnySeq::run_sii_test (Param_Test_ptr objref,
                            CORBA::Environment &ACE_TRY_ENV)
 {
-  Param_Test::AnySeq_out out (this->out_.out ());
-  this->ret_ = objref->test_anyseq (this->in_.in (),
-                                    this->inout_.inout (),
-                                    out,
-                                    ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1 : 0);
+  ACE_TRY
+    {
+      Param_Test::AnySeq_out out (this->out_.out ());
+
+      this->ret_ = objref->test_anyseq (this->in_.in (),
+                                        this->inout_.inout (),
+                                        out,
+                                        ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      return 0;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Test_AnySeq::run_sii_test\n");
+
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (0);
 }
 
 int
@@ -189,42 +204,60 @@ Test_AnySeq::add_args (CORBA::NVList_ptr param_list,
                        CORBA::NVList_ptr retval,
                        CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::Any in_arg (Param_Test::_tc_AnySeq,
-                     (void *) &this->in_.in (),
-                     0);
-
-  CORBA::Any inout_arg (Param_Test::_tc_AnySeq,
-                        &this->inout_.inout (),
-                        0);
-
-  CORBA::Any out_arg (Param_Test::_tc_AnySeq,
-                      &this->out_.inout (), // .out () causes crash
-                      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 type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_AnySeq,
-                                                    // see above
-                                                    &this->ret_.inout (),
-                                                    // does not own
-                                                    0, 
-                                                    ACE_TRY_ENV);
-  return 0;
+  ACE_TRY
+    {
+      CORBA::Any in_arg (Param_Test::_tc_AnySeq,
+                         (void *) &this->in_.in (),
+                         0);
+
+      CORBA::Any inout_arg (Param_Test::_tc_AnySeq,
+                            &this->inout_.inout (),
+                            0);
+
+      CORBA::Any out_arg (Param_Test::_tc_AnySeq,
+                          &this->out_.inout (), // .out () causes crash
+                          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;
+
+      CORBA::NamedValue *item = retval->item (0,
+                                              ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      item->value ()->replace (Param_Test::_tc_AnySeq,
+                               &this->ret_.inout (),
+                               0, // does not own
+                               ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      return 0;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Test_AnySeq::add_args\n");
+
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (0);
 }
 
 CORBA::Boolean