Fri Feb 13 14:35:39 UTC 2009 Marcel Smit <msmit@remedy.nl>

        Implementation of the ZIOP Beta 1 spec
        
        * tao/CDR.cpp:
        * tao/CDR.h:
        * tao/CDR.inl:
        * tao/Messaging/Asynch_Invocation.cpp:
        * tao/TAO_Server_Request.cpp:
          Removed obsolete compression flag.
          
        * tao/Compression/zlib/ZlibCompressor.cpp:
        * tao/Compression/bzip2/Bzip2Compressor.cpp:
        * tao/Compression/Compression.pidl:
          Added description to Compression exception in order to
          meet the ZIOP Beta 1 specification
        
        * tao/Compression/Compression_Manager.cpp:
          No major changes made.

        * tao/GIOP_Message_Base.cpp:
        * tao/GIOP_Message_Base.h:
        * tao/GIOP_Message_State.cpp:
          Implementation of compression and decompression methods.
          
        * tao/ORB_Core.h:
        * tao/ORB_Core.inl:
          Removed ziop_enabled method since it became obsolete.
        
        * tao/orbconf.h:
          Implemented compression policies.
        
        * tao/Remote_Invocation.cpp:
        * tao/PortableServer/Upcall_Wrapper.cpp:
          Removed compression and decompression methods here (moved
          to GIOP_Message_Base.
          
        * tao/Synch_Invocation.cpp:
          Due to interface change of format_message method in GIOP_Message_Base.
          Removed obsolete compression flag.
        
        * tao/ZIOP_Adapter.h:
        * tao/ZIOP/ZIOP.cpp:
        * tao/ZIOP/ZIOP.h:
        * tao/ZIOP/ZIOP.pidl:
          Refactored current ZIOP implementation in order to meet
          the ZIOP Beta 1 specification.
          
        * tao/ZIOP/ZIOP_Policy_i.cpp:
        * tao/ZIOP/ZIOP_Policy_i.h:
        * tao/ZIOP/ZIOP_Policy_Validator.cpp:
        * tao/ZIOP/ZIOP_PolicyFactory.cpp:
          Implemented compression policies.

        * tao/Transport.cpp:
        * tao/Transport.h:
        * tao/IIOP_Transport.cpp:
        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
        * tao/Strategies/DIOP_Transport.cpp:
        * tao/Strategies/SHMIOP_Transport.cpp:
          Due to interface change of format_message method in GIOP_Message_Base.

1 files changed, 9 insertions, 23 deletions

diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index 9e7ce66d489..fe652ebf4c2 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -4,7 +4,6 @@
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Collocated_Arguments_Converter.h"
 #include "tao/SystemException.h"
-#include "tao/ZIOP_Adapter.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/ServerRequestInterceptor_Adapter.h"
@@ -246,33 +245,20 @@ TAO::Upcall_Wrapper::post_upcall (TAO_ServerRequest& server_request,
                                   TAO::Argument * const * args,
                                   size_t nargs)
 {
-#if defined (TAO_HAS_ZIOP) && TAO_HAS_ZIOP ==1
-  // Marshal the operation "inout" and "out" arguments and return
-  // value, if any.
-  TAO_ZIOP_Adapter* ziop_adapter = server_request.orb_core ()->ziop_adapter ();
+  TAO_OutputCDR & cdr = (*server_request.outgoing ());
+  TAO::Argument * const * const begin = args;
+  TAO::Argument * const * const end   = args + nargs;
 
-  if (ziop_adapter)
-    {
-       ziop_adapter->marshal_reply_data (server_request, args, nargs);
-    }
-  else
-#endif
+  for (TAO::Argument * const * i = begin; i != end; ++i)
     {
-      TAO_OutputCDR & cdr = (*server_request.outgoing ());
-      TAO::Argument * const * const begin = args;
-      TAO::Argument * const * const end   = args + nargs;
-
-      for (TAO::Argument * const * i = begin; i != end; ++i)
+      if (!(*i)->marshal (cdr))
         {
-          if (!(*i)->marshal (cdr))
-            {
-              TAO_OutputCDR::throw_skel_exception (errno);
-            }
+          TAO_OutputCDR::throw_skel_exception (errno);
         }
-
-      // Reply body marshaling completed.  No other fragments to send.
-      cdr.more_fragments (false);
     }
+
+  // Reply body marshaling completed.  No other fragments to send.
+  cdr.more_fragments (false);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL