1 files changed, 23 insertions, 62 deletions

diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index 73b9f6fde18..8619e87fdd1 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -58,7 +58,30 @@ void
 Test_Unbounded_WString::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_;
+  req->add_out_arg ("s3") <<= this->out_;
+
+  req->set_return_type (CORBA::_tc_wstring);
+
   req->invoke (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  const CORBA::WChar *tmp;
+  req->return_value () >>= tmp;
+  this->ret_ = CORBA::wstring_dup (tmp);
+
+  CORBA::NamedValue_ptr o2 =
+    req->arguments ()->item (1, ACE_TRY_ENV);
+  ACE_CHECK;
+  *o2->value () >>= tmp;
+  this->inout_ = CORBA::wstring_dup (tmp);
+
+  CORBA::NamedValue_ptr o3 =
+    req->arguments ()->item (2, ACE_TRY_ENV);
+  ACE_CHECK;
+  *o3->value () >>= tmp;
+  this->out_ = CORBA::wstring_dup (tmp);
 }
 
 int
@@ -123,68 +146,6 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref,
   return -1;
 }
 
-int
-Test_Unbounded_WString::add_args (CORBA::NVList_ptr param_list,
-				                          CORBA::NVList_ptr retval,
-				                          CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      // create the parameters
-      CORBA::Any in_arg (CORBA::_tc_wstring,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (CORBA::_tc_wstring,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (CORBA::_tc_wstring,
-                          &this->out_,
-                          0);
-
-      // add parameters
-      param_list->add_value ("ws1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("ws2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("ws3",
-                             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 (CORBA::_tc_wstring,
-                               &this->ret_,
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Unbounded_WString::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
-}
-
 CORBA::Boolean
 Test_Unbounded_WString::check_validity (void)
 {