ChangeLogTag: Wed Jul 23 13:28:17 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

29 files changed, 381 insertions, 580 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index a77c90cb6c7..a2fdd6c798d 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,49 @@
+Wed Jul 23 13:28:17 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Argument.cpp:
+        * tao/Argument.h:
+        * tao/BD_String_Argument_T.cpp:
+        * tao/BD_String_Argument_T.h:
+        * tao/Basic_Argument_T.cpp:
+        * tao/Basic_Argument_T.h:
+        * tao/Fixed_Array_Argument_T.cpp:
+        * tao/Fixed_Array_Argument_T.h:
+        * tao/Fixed_Array_Argument_T.inl:
+        * tao/Fixed_Size_Argument_T.cpp:
+        * tao/Fixed_Size_Argument_T.h:
+        * tao/Object_Argument_T.cpp:
+        * tao/Object_Argument_T.h:
+        * tao/Special_Basic_Argument_T.cpp:
+        * tao/Special_Basic_Argument_T.h:
+        * tao/UB_String_Argument_T.cpp:
+        * tao/UB_String_Argument_T.h:
+        * tao/Var_Array_Argument_T.cpp:
+        * tao/Var_Array_Argument_T.h:
+        * tao/Var_Array_Argument_T.inl:
+        * tao/Var_Size_Argument_T.cpp:
+        * tao/Var_Size_Argument_T.h:
+
+	  Added and removed methods related to interceptors
+	  based on a clearer understanding, thanks to Ossama
+	  <ossama@dre.vanderbilt.edu> and Bala <bala@dre.vanderbilt.edu>.
+	  Also change the return signature of some of the arg()
+	  methods for arrays.
+
+        * tao/TAO.dsp:
+
+	  Added a missing file to the project.
+
+        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp:
+        * TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:
+
+	  Added generation of '_set' or '_get_ prefix to 
+	  operation names for atttributes in thru-POA
+	  collocated proxy classes on the skeleton side.
+          Also added generation of exception data in stub operations.
+
 Tue Jul 22 17:44:40 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index 6e71a9aa4b6..d6873274bdd 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -82,7 +82,8 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       class_name +=  node->local_name ();
     }
 
-  *os << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl << be_nl
+      << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   // Generate the skeleton class name.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
index 8f026a892a0..4ddbf3039a0 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
@@ -46,7 +46,9 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
   // Don't do anything if the exception list is empty.
   if (node->exceptions ())
     {
-      *os << "static TAO_Exception_Data " << "_tao_" << node->flat_name ()
+      *os << be_nl << be_nl
+          << "static TAO_Exception_Data" << be_nl
+          << "_tao_" << node->flat_name ()
           << "_exceptiondata [] = " << be_idt_nl;
       *os << "{" << be_idt_nl;
 
@@ -74,7 +76,7 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
             }
         }
 
-      *os << be_uidt_nl << "};" << be_uidt_nl << be_nl;
+      *os << be_uidt_nl << "};" << be_uidt;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index 5b2e32b3596..5134fc13c40 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -510,6 +510,15 @@ be_visitor_operation::gen_stub_operation_body (
   *os << be_uidt_nl
       << "};" << be_uidt;
 
+  if (this->gen_pre_stub_info (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_cs::"
+                         "visit_operation - "
+                         "codegen for exceptiondata failed\n"),
+                        -1);
+    }
+
   *os << be_nl << be_nl
       << "TAO::Invocation_Adapter _tao_call (" << be_idt << be_idt_nl
       << "this," << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
index 56ef1df30ec..14715e749b1 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
@@ -23,8 +23,23 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "static void" << be_nl
-      << node->local_name () << " (" << be_idt << be_idt_nl
+  *os << "static void" << be_nl;
+
+  // Check if we are an attribute node in disguise.
+  if (this->ctx_->attribute ())
+    {
+      // Now check if we are a "get" or "set" operation.
+      if (node->nmembers () == 1)
+        {
+          *os << "_set_";
+        }
+      else
+        {
+          *os << "_get_";
+        }
+    }
+
+  *os << node->local_name () << " (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj," << be_nl
       << "CORBA::Object_out obj_forward," << be_nl
       << "TAO::Argument ** args," << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
index b00c3b22464..0bcff4d1ce7 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
@@ -52,8 +52,23 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation (
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << "void" << be_nl
-      << intf->full_thru_poa_proxy_impl_name () << "::"
-      << node->local_name () << " (" << be_idt << be_idt_nl
+      << intf->full_thru_poa_proxy_impl_name () << "::";
+
+  // Check if we are an attribute node in disguise.
+  if (this->ctx_->attribute ())
+    {
+      // Now check if we are a "get" or "set" operation.
+      if (node->nmembers () == 1)
+        {
+          *os << "_set_";
+        }
+      else
+        {
+          *os << "_get_";
+        }
+    }
+
+  *os << node->local_name () << " (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj," << be_nl
       << "CORBA::Object_out forward," << be_nl
       << "TAO::Argument ** args," << be_nl
diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp
index 6aac4859ad8..0b688712019 100644
--- a/TAO/tao/Argument.cpp
+++ b/TAO/tao/Argument.cpp
@@ -30,8 +30,3 @@ TAO::Argument::interceptor_result (CORBA::Any *)
 {
 }
 
-CORBA::Boolean
-TAO::Argument::interceptor_replace (CORBA::Any &)
-{
-  return 1;
-}
diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h
index 9b91acdfe23..33492d35e9f 100644
--- a/TAO/tao/Argument.h
+++ b/TAO/tao/Argument.h
@@ -52,7 +52,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
     virtual void interceptor_param (Dynamic::Parameter &);
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
   };
 
 }
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
index f73c97314bd..ebffbb2784a 100644
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ b/TAO/tao/BD_String_Argument_T.cpp
@@ -32,15 +32,6 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-CORBA::Boolean
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= to_S (this->x_, BOUND);
-}
-
 // ===========================================================
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
@@ -72,15 +63,6 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-CORBA::Boolean
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= to_S (this->x_, BOUND);
-}
-
 // ==============================================================
 
 template<typename S, 
@@ -96,6 +78,20 @@ TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::demarshal (
   return cdr >> to_S (this->x_, BOUND);
 }
 
+template<typename S, 
+         typename S_out, 
+         typename to_S, 
+         typename from_S, 
+         size_t BOUND>
+void
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= from_S (this->x_, BOUND);
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S, 
@@ -124,18 +120,6 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::interceptor_result (
   (*any) <<= from_S (this->x_.in (), BOUND);
 }
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-CORBA::Boolean
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::
-interceptor_replace (CORBA::Any & any)
-{
-  return any >>= to_S (this->x_.out (), BOUND);
-}
-
 // ============================================================
 
 template<typename S, 
@@ -165,18 +149,6 @@ TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-CORBA::Boolean
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-interceptor_replace (CORBA::Any & any)
-{
-  return any >>= to_S (this->x_.out (), BOUND);
-}
-
 // ===========================================================
 
 template<typename S, 
@@ -218,18 +190,6 @@ interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-CORBA::Boolean
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-interceptor_replace (CORBA::Any & any)
-{
-  return any >>= to_S (this->x_.in (), BOUND);
-}
-
 // ==============================================================
 
 template<typename S, 
@@ -246,6 +206,20 @@ TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::marshal (
   return cdr << from_S (this->x_.in (), BOUND);
 }
 
+template<typename S, 
+         typename S_var, 
+         typename S_out,
+         typename to_S, 
+         typename from_S, 
+         size_t BOUND>
+void
+TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::
+interceptor_param (Dynamic::Parameter & p)
+{
+  p.argument <<= from_S (this->x_.in (), BOUND);
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S, 
@@ -273,16 +247,4 @@ interceptor_result (CORBA::Any * any)
   (*any) <<= from_S (this->x_.in (), BOUND);
 }
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-CORBA::Boolean
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-interceptor_replace (CORBA::Any & any)
-{
-  return any >>= to_S (this->x_.out (), BOUND);
-}
-
 #endif /* TAO_BD_STRING_ARGUMENT_T_C */
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index 1744d3ba5c2..0fa7b4f2480 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -40,7 +40,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     const S * arg (void) const;
 
@@ -64,7 +63,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S *& arg (void);
 
@@ -90,6 +88,8 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S *& arg (void);
 
   private:
@@ -115,7 +115,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S *& arg (void);
 
@@ -145,7 +144,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     const S * arg (void) const;
 
@@ -173,7 +171,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S *& arg (void);
 
@@ -200,6 +197,8 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S *& arg (void);
 
   private:
@@ -225,7 +224,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S *& arg (void);
 
diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp
index 94a7bc95e3d..f9cd2613a6a 100644
--- a/TAO/tao/Basic_Argument_T.cpp
+++ b/TAO/tao/Basic_Argument_T.cpp
@@ -28,13 +28,6 @@ TAO::In_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::In_Basic_Argument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= ACE_const_cast (S &, this->x_);
-}
-
 // ===========================================================
 
 template<typename S>
@@ -59,13 +52,6 @@ TAO::Inout_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Basic_Argument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ==============================================================
 
 template<typename S>
@@ -75,6 +61,14 @@ TAO::Out_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
+template<typename S>
+void
+TAO::Out_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+{
+  p.argument <<= this->x_;
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S>
@@ -91,13 +85,6 @@ TAO::Ret_Basic_Argument_T<S>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Ret_Basic_Argument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ============================================================
 
 template<typename S>
@@ -115,13 +102,6 @@ TAO::In_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::In_Basic_SArgument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ===========================================================
 
 template<typename S>
@@ -146,13 +126,6 @@ TAO::Inout_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Basic_SArgument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ==============================================================
 
 template<typename S>
@@ -162,6 +135,14 @@ TAO::Out_Basic_SArgument_T<S>::marshal (TAO_OutputCDR &cdr)
   return cdr << this->x_;
 }
 
+template<typename S>
+void
+TAO::Out_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+{
+  p.argument <<= this->x_;
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S>
@@ -178,11 +159,4 @@ TAO::Ret_Basic_SArgument_T<S>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Ret_Basic_SArgument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 #endif /* TAO_BASIC_ARGUMENT_T_C */
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index 736e789abbf..88acff7dd5e 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -38,7 +38,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S arg (void) const;
 
@@ -62,7 +61,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -84,6 +82,8 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S & arg (void);
 
   private:
@@ -105,7 +105,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -131,7 +130,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S arg (void) const;
 
@@ -155,7 +153,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -177,6 +174,8 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S & arg (void);
 
   private:
@@ -198,7 +197,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index 5244c735dd7..e84f23ab0b0 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -32,34 +32,29 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= this->x_;
-}
-
 // ===========================================================
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_forany>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal (
+    TAO_OutputCDR & cdr
+  )
 {
   return cdr << this->x_;
 }
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_forany>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
+    TAO_InputCDR & cdr
+  )
 {
   return cdr >> this->x_;
 }
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 void
-TAO::Inout_Fixed_Array_Argument_T<S,S_forany>::interceptor_param (
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
     Dynamic::Parameter & p
   )
 {
@@ -67,22 +62,25 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S, typename S_forany>
+// ==============================================================
+
+template<typename S, typename S_slice, typename S_forany>
 CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_forany>::interceptor_replace (
-    CORBA::Any & any
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
+    TAO_InputCDR & cdr
   )
 {
-  return any >>= this->x_;
+  return cdr >> this->x_;
 }
 
-// ==============================================================
-
-template<typename S, typename S_forany>
-CORBA::Boolean
-TAO::Out_Fixed_Array_Argument_T<S,S_forany>::demarshal (TAO_InputCDR & cdr)
+template<typename S, typename S_slice, typename S_forany>
+void
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
+    Dynamic::Parameter & p
+  )
 {
-  return cdr >> this->x_;
+  p.argument <<= this->x_;
+  p.mode = CORBA::PARAM_OUT;
 }
 
 // ============================================================
@@ -111,15 +109,6 @@ interceptor_result (CORBA::Any * any)
   (*any) <<= S_forany (this->x_.ptr ());
 }
 
-template<typename S, typename S_slice, typename S_var, typename S_forany>
-CORBA::Boolean
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany>::
-interceptor_replace (CORBA::Any & any)
-{
-  S_forany tmp (this->x_.ptr ());
-  return any >>= tmp;
-}
-
 // ============================================================
 
 template<typename S, typename S_forany>
@@ -140,16 +129,6 @@ TAO::In_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S, typename S_forany>
-CORBA::Boolean
-TAO::In_Fixed_Array_SArgument_T<S,S_forany>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  S_forany tmp (this->x_);
-  return any >>= tmp;
-}
-
 // ===========================================================
 
 template<typename S, typename S_forany>
@@ -177,16 +156,6 @@ TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  S_forany tmp (this->x_);
-  return any >>= tmp;
-}
-
 // ==============================================================
 
 template<typename S, typename S_forany>
@@ -196,6 +165,16 @@ TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::marshal (TAO_OutputCDR &cdr)
   return cdr << S_forany (this->x_);
 }
 
+template<typename S, typename S_forany>
+void
+TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= S_forany (this->x_);
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S_slice, typename S_var, typename S_forany>
@@ -216,13 +195,4 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
   (*any) <<= S_forany (this->x_.ptr ());
 }
 
-template<typename S_slice, typename S_var, typename S_forany>
-CORBA::Boolean
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::
-interceptor_replace (CORBA::Any & any)
-{
-  S_forany tmp (this->x_.inout ());
-  return any >>= tmp;
-}
-
 #endif /* TAO_FIXED_ARRAY_ARGUMENT_T_C */
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
index a25fc2285d3..33232b6c9d3 100644
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ b/TAO/tao/Fixed_Array_Argument_T.h
@@ -38,9 +38,8 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
-    const S & arg (void) const;
+    const S_slice * arg (void) const;
 
   private:
     S_forany x_;
@@ -52,7 +51,7 @@ namespace TAO
    * @brief INOUT stub argument of fixed size element array.
    *
    */
-  template<typename S, typename S_forany>
+  template<typename S, typename S_slice, typename S_forany>
   class Inout_Fixed_Array_Argument_T : public Argument
   {
   public:
@@ -62,9 +61,8 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
-    S & arg (void);
+    S_slice * arg (void);
 
   private:
     S_forany x_;
@@ -76,7 +74,7 @@ namespace TAO
    * @brief OUT stub argument of fixed size element array.
    *
    */
-  template<typename S, typename S_forany>
+  template<typename S, typename S_slice, typename S_forany>
   class Out_Fixed_Array_Argument_T : public Argument
   {
   public:
@@ -84,7 +82,9 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
-    S & arg (void);
+    virtual void interceptor_param (Dynamic::Parameter &);
+
+   S_slice *& arg (void);
 
   private:
     S_forany x_;
@@ -108,7 +108,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S_slice *& arg (void);
 
@@ -134,7 +133,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     const S & arg (void) const;
 
@@ -158,7 +156,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -180,6 +177,8 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S & arg (void);
 
   private:
@@ -201,7 +200,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S_slice *& arg (void);
 
@@ -237,8 +235,12 @@ namespace TAO
     typedef In_Fixed_Array_Argument_T<T,
                                       T_slice,
                                       T_forany>         in_arg_val;
-    typedef Inout_Fixed_Array_Argument_T<T,T_forany>    inout_arg_val;
-    typedef Out_Fixed_Array_Argument_T<T,T_forany>      out_arg_val;
+    typedef Inout_Fixed_Array_Argument_T<T,
+                                         T_slice,
+                                         T_forany>      inout_arg_val;
+    typedef Out_Fixed_Array_Argument_T<T,
+                                       T_slice,
+                                       T_forany>        out_arg_val;
     typedef Ret_Fixed_Array_Argument_T<T,
                                        T_slice,
                                        T_var,
diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl
index 71bd102564d..9e2a2b3cb01 100644
--- a/TAO/tao/Fixed_Array_Argument_T.inl
+++ b/TAO/tao/Fixed_Array_Argument_T.inl
@@ -9,7 +9,7 @@ In_Fixed_Array_Argument_T (const S x)
 
 template<typename S, typename S_slice, typename S_forany>
 ACE_INLINE
-const S &
+const S_slice *
 TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
 {
   return this->x_.in ();
@@ -17,34 +17,34 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
 
 // ===========================================================================
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 ACE_INLINE
-TAO::Inout_Fixed_Array_Argument_T<S,S_forany>::Inout_Fixed_Array_Argument_T (
-    S x
-  )
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::
+Inout_Fixed_Array_Argument_T (S x)
   : x_ (x)
 {}
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 ACE_INLINE
-S &
-TAO::Inout_Fixed_Array_Argument_T<S,S_forany>::arg (void)
+S_slice *
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void)
 {
   return this->x_.inout ();
 }
 
 // ===========================================================================
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 ACE_INLINE
-TAO::Out_Fixed_Array_Argument_T<S,S_forany>::Out_Fixed_Array_Argument_T (S x)
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::
+Out_Fixed_Array_Argument_T (S x)
   : x_ (x)
 {}
 
 template<typename S, typename S_slice, typename S_forany>
 ACE_INLINE
-S &
-TAO::Out_Fixed_Array_Argument_T<S,S_forany>::arg (void)
+S_slice *&
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp
index 7632ff9da46..b8eea0acf38 100644
--- a/TAO/tao/Fixed_Size_Argument_T.cpp
+++ b/TAO/tao/Fixed_Size_Argument_T.cpp
@@ -28,13 +28,6 @@ TAO::In_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::In_Fixed_Size_Argument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ===========================================================
 
 template<typename S>
@@ -53,19 +46,14 @@ TAO::Inout_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
 
 template<typename S>
 void
-TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param (
+    Dynamic::Parameter & p
+  )
 {
   p.argument <<= *this->x_;
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ==============================================================
 
 template<typename S>
@@ -75,6 +63,16 @@ TAO::Out_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
+template<typename S>
+void
+TAO::Out_Fixed_Size_Argument_T<S>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= this->x_;
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S>
@@ -91,14 +89,6 @@ TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  S * tmp = &this->x_;
-  return any >>= tmp;
-}
-
 // ============================================================
 
 template<typename S>
@@ -116,13 +106,6 @@ TAO::In_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::In_Fixed_Size_SArgument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ===========================================================
 
 template<typename S>
@@ -141,19 +124,14 @@ TAO::Inout_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
 
 template<typename S>
 void
-TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param (
+    Dynamic::Parameter & p
+  )
 {
   p.argument <<= *this->x_;
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ==============================================================
 
 template<typename S>
@@ -163,6 +141,14 @@ TAO::Out_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR &cdr)
   return cdr << this->x_;
 }
 
+template<typename S>
+void
+TAO::Out_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+{
+  p.argument <<= *this->x_;
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S>
@@ -179,11 +165,4 @@ TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_result (CORBA::Any * any)
   (*any) <<= *this->x_;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 #endif /* TAO_FIXED_SIZE_ARGUMENT_T_C */
diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
index e8ebb56debf..bccf1f238a1 100644
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ b/TAO/tao/Fixed_Size_Argument_T.h
@@ -38,7 +38,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     const S & arg (void) const;
 
@@ -62,7 +61,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -84,6 +82,8 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S & arg (void);
 
   private:
@@ -105,7 +105,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -131,7 +130,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     const S & arg (void) const;
 
@@ -155,7 +153,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -177,6 +174,8 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S & arg (void);
 
   private:
@@ -198,7 +197,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp
index ef8563a5ad4..10d038b305d 100644
--- a/TAO/tao/Object_Argument_T.cpp
+++ b/TAO/tao/Object_Argument_T.cpp
@@ -28,13 +28,6 @@ TAO::In_Object_Argument_T<S_ptr>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S_ptr>
-CORBA::Boolean
-TAO::In_Object_Argument_T<S_ptr>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ===========================================================
 
 template<typename S_ptr>
@@ -62,13 +55,6 @@ TAO::Inout_Object_Argument_T<S_ptr>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S_ptr>
-CORBA::Boolean
-TAO::Inout_Object_Argument_T<S_ptr>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ==============================================================
 
 template<typename S_ptr, typename S_out>
@@ -78,6 +64,16 @@ TAO::Out_Object_Argument_T<S_ptr,S_out>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
+template<typename S_ptr, typename S_out>
+void
+TAO::Out_Object_Argument_T<S_ptr,S_out>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= this->x_;
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S_ptr, typename S_var>
@@ -94,15 +90,6 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_.in ();
 }
 
-template<typename S_ptr, typename S_var>
-CORBA::Boolean
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= this->x_;
-}
-
 // ============================================================
 
 template<typename S_ptr, typename S_var>
@@ -122,15 +109,6 @@ TAO::In_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S_ptr, typename S_var>
-CORBA::Boolean
-TAO::In_Object_SArgument_T<S_ptr,S_var>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= this->x_.out ();
-}
-
 // ===========================================================
 
 template<typename S_ptr, typename S_var>
@@ -157,15 +135,6 @@ TAO::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S_ptr, typename S_var>
-CORBA::Boolean
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= this->x_.out ();
-}
-
 // ==============================================================
 
 template<typename S_ptr, typename S_var, typename S_out>
@@ -175,6 +144,16 @@ TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::marshal (TAO_OutputCDR &cdr)
   return cdr << this->x_.in ();
 }
 
+template<typename S_ptr, typename S_var, typename S_out>
+void
+TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= this->x_.in ();
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S_ptr, typename S_var>
@@ -193,13 +172,4 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_result (
   (*any) <<= this->x_.in ();
 }
 
-template<typename S_ptr, typename S_var>
-CORBA::Boolean
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= this->x_.out ();
-}
-
 #endif /* TAO_OBJECT_ARGUMENT_T_C */
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
index 0909a34dada..01cc6d394b6 100644
--- a/TAO/tao/Object_Argument_T.h
+++ b/TAO/tao/Object_Argument_T.h
@@ -43,7 +43,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S_ptr arg (void) const;
 
@@ -67,7 +66,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S_ptr & arg (void);
 
@@ -89,6 +87,8 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S_out arg (void);
 
   private:
@@ -110,7 +110,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S_ptr & arg (void);
 
@@ -136,7 +135,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S_ptr arg (void) const;
 
@@ -160,7 +158,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S_ptr & arg (void);
 
@@ -182,6 +179,8 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S_out arg (void);
 
   private:
@@ -203,7 +202,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S_ptr & arg (void);
 
diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp
index bb25c2f231e..acc2dfc69b5 100644
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ b/TAO/tao/Special_Basic_Argument_T.cpp
@@ -30,15 +30,6 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= to_S (ACE_const_cast (S &, this->x_));
-}
-
 // ===========================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -69,15 +60,6 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= to_S (this->x_);
-}
-
 // ==============================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -89,6 +71,16 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
   return cdr >> to_S (this->x_);
 }
 
+template<typename S, typename to_S, typename from_S>
+void
+TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= from_S (this->x_);
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -109,15 +101,6 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_result (
   (*any) <<= this->x_;
 }
 
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= to_S (this->x_);
-}
-
 // ============================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -139,15 +122,6 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= to_S (this->x_);
-}
-
 // ===========================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -178,15 +152,6 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Inout_Special_Basic_SArgument_T <S,to_S,from_S>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= to_S (this->x_);
-}
-
 // ==============================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -198,6 +163,16 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
   return cdr << from_S (this->x_);
 }
 
+template<typename S, typename to_S, typename from_S>
+void
+TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= from_S (this->x_);
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ==============================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -218,14 +193,5 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_result (
   (*any) <<= this->x_;
 }
 
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= to_S (this->x_);
-}
-
 #endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_C */
 
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index ec992a1e147..bf0b2802196 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -39,7 +39,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S const & arg (void);
 
@@ -63,7 +62,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -85,6 +83,8 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S & arg (void);
 
   private:
@@ -106,7 +106,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -132,7 +131,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S arg (void) const;
 
@@ -156,7 +154,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -178,6 +175,8 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S & arg (void);
 
   private:
@@ -199,7 +198,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 31974912077..1af5d6f78b6 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -2800,19 +2800,7 @@ SOURCE=.\Codeset_Translator_Factory_T.cpp
 # Begin Source File

 

 SOURCE=.\Connector_Impl.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index 86dd9f0a172..ba45c94a620 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -28,13 +28,6 @@ TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::In_UB_String_Argument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ===========================================================
 
 template<typename S>
@@ -60,13 +53,6 @@ TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Inout_UB_String_Argument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= (const S*&) this->x_;
-}
-
 // ==============================================================
 
 template<typename S, typename S_out>
@@ -76,6 +62,16 @@ TAO::Out_UB_String_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
+template<typename S, typename S_out>
+void
+TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= this->x_;
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S, typename S_var>
@@ -92,13 +88,6 @@ TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_.in ();
 }
 
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= (const S*&) this->x_.inout ();
-}
-
 // ============================================================
 
 template<typename S, typename S_var>
@@ -118,13 +107,6 @@ TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= (const S*) this->x_.out ();
-}
-
 // ===========================================================
 
 template<typename S, typename S_var>
@@ -151,15 +133,6 @@ TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= (const S *)this->x_.out ();
-}
-
 // ==============================================================
 
 template<typename S, typename S_var>
@@ -169,6 +142,16 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
   return cdr << this->x_.in ();
 }
 
+template<typename S, typename S_var>
+void
+TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= this->x_.in ();
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S, typename S_var>
@@ -185,13 +168,4 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_.in ();
 }
 
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= (const S*) this->x_.out ();
-}
-
 #endif /* TAO_UB_STRING_ARGUMENT_T_C */
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 763d6810266..8968e7565db 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -38,7 +38,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     const S * arg (void) const;
 
@@ -62,7 +61,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S *& arg (void);
 
@@ -84,6 +82,8 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S *& arg (void);
 
   private:
@@ -105,7 +105,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S *& arg (void);
 
@@ -131,7 +130,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     const S * arg (void) const;
 
@@ -155,7 +153,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S *& arg (void);
 
@@ -177,6 +174,8 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S *& arg (void);
 
   private:
@@ -198,7 +197,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S *& arg (void);
 
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp
index 8d12aa336a8..0377f91ef42 100644
--- a/TAO/tao/Var_Array_Argument_T.cpp
+++ b/TAO/tao/Var_Array_Argument_T.cpp
@@ -32,34 +32,29 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= this->x_;
-}
-
 // ===========================================================
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 CORBA::Boolean
-TAO::Inout_Var_Array_Argument_T<S,S_forany>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::marshal (
+    TAO_OutputCDR & cdr
+  )
 {
   return cdr << this->x_;
 }
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 CORBA::Boolean
-TAO::Inout_Var_Array_Argument_T<S,S_forany>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::demarshal (
+    TAO_InputCDR & cdr
+  )
 {
   return cdr >> this->x_;
 }
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 void
-TAO::Inout_Var_Array_Argument_T<S,S_forany>::interceptor_param (
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
     Dynamic::Parameter & p
   )
 {
@@ -67,15 +62,6 @@ TAO::Inout_Var_Array_Argument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Var_Array_Argument_T<S,S_forany>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  return any >>= this->x_;
-}
-
 // ==============================================================
 
 template<typename S, 
@@ -96,6 +82,19 @@ TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany>::demarshal (
   return cdr >> tmp;
 }
 
+template<typename S, 
+         typename S_slice, 
+         typename S_var, 
+         typename S_out, 
+         typename S_forany>
+void
+TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany>::
+interceptor_param (Dynamic::Parameter & p)
+{
+  p.argument <<= this->x_;
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S, typename S_slice, typename S_var, typename S_forany>
@@ -122,15 +121,6 @@ interceptor_result (CORBA::Any * any)
   (*any) <<= S_forany (this->x_.ptr ());
 }
 
-template<typename S, typename S_slice, typename S_var, typename S_forany>
-CORBA::Boolean
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany>::
-interceptor_replace (CORBA::Any & any)
-{
-  S_forany tmp (this->x_.ptr ());
-  return any >>= tmp;
-}
-
 // ============================================================
 
 template<typename S, typename S_forany>
@@ -151,16 +141,6 @@ TAO::In_Var_Array_SArgument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S, typename S_forany>
-CORBA::Boolean
-TAO::In_Var_Array_SArgument_T<S,S_forany>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  S_forany tmp (this->x_);
-  return any >>= tmp;
-}
-
 // ===========================================================
 
 template<typename S, typename S_forany>
@@ -188,16 +168,6 @@ TAO::Inout_Var_Array_SArgument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Var_Array_SArgument_T<S,S_forany>::interceptor_replace (
-    CORBA::Any & any
-  )
-{
-  S_forany tmp (this->x_);
-  return any >>= tmp;
-}
-
 // ==============================================================
 
 template<typename S_slice, typename S_var, typename S_forany>
@@ -209,6 +179,16 @@ TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
   return cdr << S_forany (this->x_.ptr ());
 }
 
+template<typename S_slice, typename S_var, typename S_forany>
+void
+TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= S_forany (this->x_);
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S_slice, typename S_var, typename S_forany>
@@ -229,13 +209,4 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
   (*any) <<= S_forany (this->x_.ptr ());
 }
 
-template<typename S_slice, typename S_var, typename S_forany>
-CORBA::Boolean
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::
-interceptor_replace (CORBA::Any & any)
-{
-  S_forany tmp (this->x_.ptr ());
-  return any >>= tmp;
-}
-
 #endif /* TAO_VAR_ARRAY_ARGUMENT_T_C */
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index 6ce9cc7ad7d..b7b9940c575 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -38,9 +38,8 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
-    const S & arg (void) const;
+    const S_slice * arg (void) const;
 
   private:
     S_forany x_;
@@ -52,7 +51,7 @@ namespace TAO
    * @brief INOUT stub argument of variable size element array.
    *
    */
-  template<typename S, typename S_forany>
+  template<typename S, typename S_slice, typename S_forany>
   class Inout_Var_Array_Argument_T : public Argument
   {
   public:
@@ -62,9 +61,8 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
-    S & arg (void);
+    S_slice * arg (void);
 
   private:
     S_forany x_;
@@ -88,6 +86,8 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S_slice *& arg (void);
 
   private:
@@ -112,7 +112,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S_slice *& arg (void);
 
@@ -138,7 +137,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     const S & arg (void) const;
 
@@ -162,7 +160,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -184,6 +181,8 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S_slice *& arg (void);
 
   private:
@@ -205,7 +204,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S_slice *& arg (void);
 
@@ -242,7 +240,9 @@ namespace TAO
     typedef In_Var_Array_Argument_T<T,
                                     T_slice,
                                     T_forany>           in_arg_val;
-    typedef Inout_Var_Array_Argument_T<T,T_forany>      inout_arg_val;
+    typedef Inout_Var_Array_Argument_T<T,
+                                       T_slice,
+                                       T_forany>        inout_arg_val;
     typedef Out_Var_Array_Argument_T<T,
                                      T_slice,
                                      T_var,
diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl
index ff094ac9bad..b26b391f305 100644
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ b/TAO/tao/Var_Array_Argument_T.inl
@@ -9,7 +9,7 @@ In_Var_Array_Argument_T (const S x)
 
 template<typename S, typename S_slice, typename S_forany>
 ACE_INLINE
-const S &
+const S_slice *
 TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
 {
   return this->x_.in ();
@@ -17,18 +17,17 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
 
 // ==========================================================================
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 ACE_INLINE
-TAO::Inout_Var_Array_Argument_T<S,S_forany>::Inout_Var_Array_Argument_T (
-    S x
-  )
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::
+Inout_Var_Array_Argument_T (S x)
   : x_ (x)
 {}
 
-template<typename S, typename S_forany>
+template<typename S, typename S_slice, typename S_forany>
 ACE_INLINE
-S &
-TAO::Inout_Var_Array_Argument_T<S,S_forany>::arg (void)
+S_slice *
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::arg (void)
 {
   return this->x_.inout ();
 }
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index 3710333fc4c..6aa38f8c812 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -28,13 +28,6 @@ TAO::In_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::In_Var_Size_Argument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ===========================================================
 
 template<typename S>
@@ -59,13 +52,6 @@ TAO::Inout_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Var_Size_Argument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ==============================================================
 
 template<typename S, typename S_out>
@@ -78,6 +64,16 @@ TAO::Out_Var_Size_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
   return cdr >> *this->x_;
 }
 
+template<typename S, typename S_out>
+void
+TAO::Out_Var_Size_Argument_T<S,S_out>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= *this->x_;
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S, typename S_var>
@@ -99,13 +95,6 @@ TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_.in ();
 }
 
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_.out ();
-}
-
 // ============================================================
 
 template<typename S>
@@ -123,13 +112,6 @@ TAO::In_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::In_Var_Size_SArgument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ===========================================================
 
 template<typename S>
@@ -154,13 +136,6 @@ TAO::Inout_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Var_Size_SArgument_T<S>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_;
-}
-
 // ==============================================================
 
 template<typename S, typename S_var>
@@ -170,6 +145,16 @@ TAO::Out_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
   return cdr << this->x_.in ();
 }
 
+template<typename S, typename S_var>
+void
+TAO::Out_Var_Size_SArgument_T<S,S_var>::interceptor_param (
+    Dynamic::Parameter & p
+  )
+{
+  p.argument <<= *this->x_;
+  p.mode = CORBA::PARAM_OUT;
+}
+
 // ============================================================
 
 template<typename S, typename S_var>
@@ -186,11 +171,4 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_.in ();
 }
 
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::interceptor_replace (CORBA::Any & any)
-{
-  return any >>= this->x_.out ();
-}
-
 #endif /* TAO_VAR_SIZE_ARGUMENT_T_C */
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
index 19ca7f03982..bc40d41c5e0 100644
--- a/TAO/tao/Var_Size_Argument_T.h
+++ b/TAO/tao/Var_Size_Argument_T.h
@@ -38,7 +38,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     const S & arg (void) const;
 
@@ -62,7 +61,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -84,6 +82,8 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S *& arg (void);
 
   private:
@@ -105,7 +105,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S *& arg (void);
 
@@ -131,7 +130,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     const S & arg (void) const;
 
@@ -155,7 +153,6 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     virtual void interceptor_param (Dynamic::Parameter &);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S & arg (void);
 
@@ -177,6 +174,8 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
+    virtual void interceptor_param (Dynamic::Parameter &);
+
     S *& arg (void);
 
   private:
@@ -198,7 +197,6 @@ namespace TAO
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
 
     virtual void interceptor_result (CORBA::Any *);
-    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
     S *& arg (void);