1 files changed, 26 insertions, 65 deletions

diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index 641975a6281..3f868f8aefb 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -50,7 +50,30 @@ void
 Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req,
                                        CORBA::Environment &ACE_TRY_ENV)
 {
+  req->add_in_arg ("s1") <<= this->in_;
+  req->add_inout_arg ("s2") <<= this->inout_.in ();
+  req->add_out_arg ("s3") <<= this->out_.in ();
+
+  req->set_return_type (Param_Test::_tc_Recursive_Struct);
+
   req->invoke (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  Param_Test::Recursive_Struct *tmp;
+  req->return_value () >>= tmp;
+  this->ret_ = new Param_Test::Recursive_Struct (*tmp);
+
+  CORBA::NamedValue_ptr o2 =
+    req->arguments ()->item (1, ACE_TRY_ENV);
+  ACE_CHECK;
+  *o2->value () >>= tmp;
+  this->inout_ = new Param_Test::Recursive_Struct (*tmp);
+
+  CORBA::NamedValue_ptr o3 =
+    req->arguments ()->item (2, ACE_TRY_ENV);
+  ACE_CHECK;
+  *o3->value () >>= tmp;
+  this->out_ = new Param_Test::Recursive_Struct (*tmp);
 }
 
 int
@@ -118,68 +141,6 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref,
   return -1;
 }
 
-int
-Test_Recursive_Struct::add_args (CORBA::NVList_ptr param_list,
-			                           CORBA::NVList_ptr retval,
-			                           CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Recursive_Struct,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Recursive_Struct,
-                            &this->inout_.inout (), // .out () causes crash
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Recursive_Struct,
-                          &this->out_.inout (),
-                          0);
-
-      // add parameters
-      param_list->add_value ("rs1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("rs2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("rs3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Recursive_Struct,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Recursive_Struct::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
-}
-
-
 CORBA::Boolean
 Test_Recursive_Struct::check_validity (void)
 {
@@ -233,7 +194,7 @@ Test_Recursive_Struct::deep_init (Param_Test::Recursive_Struct &rs,
 {
   rs.x = gen->gen_long ();
 
-  if (level == 1) 
+  if (level == 1)
   // No more recursion.
     {
       rs.children.length (0);
@@ -262,7 +223,7 @@ CORBA::Boolean
 Test_Recursive_Struct::deep_check (const Param_Test::Recursive_Struct &in_struct,
                                    const Param_Test::Recursive_Struct &test_struct)
 {
-  // Do the CORBA::Long members match? 
+  // Do the CORBA::Long members match?
   if (in_struct.x != test_struct.x)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -284,7 +245,7 @@ Test_Recursive_Struct::deep_check (const Param_Test::Recursive_Struct &in_struct
   // Otherwise recurse.
   for (CORBA::ULong i = 0; i < in_struct.children.length (); i++)
     {
-      if (!this->deep_check (in_struct.children[i], 
+      if (!this->deep_check (in_struct.children[i],
                              test_struct.children[i]))
         {
           ACE_DEBUG ((LM_DEBUG,