1 files changed, 27 insertions, 66 deletions

diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index c8298fad079..eee5a67d08f 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -51,12 +51,35 @@ void
 Test_Objref_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_Objref_Struct);
+
   req->invoke (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  Param_Test::Objref_Struct *tmp;
+  req->return_value () >>= tmp;
+  this->ret_ = new Param_Test::Objref_Struct (*tmp);
+
+  CORBA::NamedValue_ptr o2 =
+    req->arguments ()->item (1, ACE_TRY_ENV);
+  ACE_CHECK;
+  *o2->value () >>= tmp;
+  this->inout_ = new Param_Test::Objref_Struct (*tmp);
+
+  CORBA::NamedValue_ptr o3 =
+    req->arguments ()->item (2, ACE_TRY_ENV);
+  ACE_CHECK;
+  *o3->value () >>= tmp;
+  this->out_ = new Param_Test::Objref_Struct (*tmp);
 }
 
 int
 Test_Objref_Struct::init_parameters (Param_Test_ptr objref,
-				                             CORBA::Environment &ACE_TRY_ENV)
+                                                             CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_TRY
     {
@@ -71,7 +94,7 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref,
       Coffee::Desc d;
       d.name = gen->gen_string ();
 
-      this->in_.y->description (d, 
+      this->in_.y->description (d,
                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -122,68 +145,6 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref,
   return -1;
 }
 
-int
-Test_Objref_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_Objref_Struct,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Objref_Struct,
-                            &this->inout_.inout (), // .out () causes crash
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Objref_Struct,
-                          &this->out_.inout (),
-                          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
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Objref_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_Objref_Struct::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-
 CORBA::Boolean
 Test_Objref_Struct::check_validity (void)
 {
@@ -195,7 +156,7 @@ Test_Objref_Struct::check_validity (void)
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
-    { 
+    {
       if (CORBA::is_nil (this->in_.y.in ())
           || CORBA::is_nil (this->out_->y.in ())
           || CORBA::is_nil (this->ret_->y.in ())
@@ -203,7 +164,7 @@ Test_Objref_Struct::check_validity (void)
         {
           return 0;
         }
- 
+
       Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV);
       ACE_TRY_CHECK;