1 files changed, 105 insertions, 0 deletions
diff --git a/trunk/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/trunk/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
new file mode 100644
index 00000000000..ec8e6788bef
--- /dev/null
+++ b/trunk/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
@@ -0,0 +1,105 @@
+// $Id$
+#include "tao/DynamicInterface/DII_Arguments_Converter_Impl.h"
+#include "tao/DynamicInterface/DII_Arguments.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
+#include "tao/operation_details.h"
+
+
+ACE_RCSID (DynamicInterface,
+           DII_Arguments_Converter_Impl,
+           "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+void
+TAO_DII_Arguments_Converter_Impl::convert (
+    TAO_ServerRequest & server_request,
+    TAO::Argument * const args[],
+    size_t nargs
+    ACE_ENV_ARG_DECL
+  )
+{
+  // The DII requests on client side always have two arguments
+  // - one is the return argument and the other is NVList_Argument.
+  // Since the argument list in the client side is used by server side
+  // in collocation case and the server expects the list of arguments
+  // and not the NVList_Argument, we need expand the NVList_Argument
+  // to be list of Arguments.
+
+  // Before expanding NVList_Argument logic was added, the
+  // $TAO_ROOT/tests/DII_Collocated_Tests/run_test.pl should fail.
+  // The servant will get incorrect "IN" parameter from the oneway
+  // operation with single "IN" parameter and get access violation on
+  // get_in_arg () from the oneway operation with multiple "IN"
+  // parameters.
+  CORBA::NVList_ptr lst
+    = static_cast<TAO::NVList_Argument *> (server_request.operation_details ()->args()[1])->arg ();
+
+  CORBA::ULong const sz = lst->count (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (sz != nargs - 1)
+    {
+      ACE_THROW (CORBA::BAD_PARAM ());
+    }
+
+  // To avoid the use of extraction operators on CORBA::Any, we will
+  // marshal the arguments in the NVList into an output cdr and then
+  // demarshal them into the TAO::Argument array.
+  TAO_OutputCDR output;
+  for (CORBA::ULong i = 0; i < sz; ++i)
+    {
+      CORBA::NamedValue_ptr theitem = lst->item (i ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      if (!(theitem->value ()->impl ()->marshal_value (output)))
+        {
+          ACE_THROW (CORBA::BAD_PARAM ());
+        }
+    }
+
+  TAO_InputCDR input (output);
+  for (CORBA::ULong j = 0; j < sz; ++j)
+    {
+      if (!(args[j + 1]->demarshal (input)))
+        {
+          ACE_THROW (CORBA::BAD_PARAM ());
+        }
+    }
+
+  TAO_Operation_Details* details
+    = const_cast <TAO_Operation_Details*> (server_request.operation_details ());
+
+  // The NVList_Argument in operation details is converted to skel
+  // args, the invocation of the dii collocation requests should use
+  // the skel args and not use the stub args.
+  details->use_stub_args (false);
+}
+
+
+// *********************************************************************
+
+// Initialization and registration of dynamic service object.
+
+int
+TAO_DII_Arguments_Converter_Impl::Initializer (void)
+{
+  return ACE_Service_Config::process_directive (
+    ace_svc_desc_TAO_DII_Arguments_Converter_Impl);
+}
+
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  TAO_DII_Arguments_Converter_Impl,
+  ACE_TEXT ("DII_Arguments_Converter"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (TAO_DII_Arguments_Converter_Impl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0
+  )
+
+ACE_FACTORY_DEFINE (TAO_DynamicInterface, TAO_DII_Arguments_Converter_Impl)
+