Fri Feb 13 15:17:39 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
        * tao/GIOP_Message_Base.cpp
        * tao/GIOP_Message_Base.h
        * tao/IIOP_Transport.cpp
        * tao/Strategies/DIOP_Transport.cpp
        * tao/Strategies/SCIOP_Transport.cpp
        * tao/Strategies/SHMIOP_Transport.cpp
        * tao/Strategies/UIOP_Transport.cpp
        * tao/Synch_Invocation.cpp
        * tao/Synch_Reply_Dispatcher.cpp
        * tao/Transport.cpp
        * tao/Transport.h
          Pass the stub as pointer, it could be zero

11 files changed, 21 insertions, 17 deletions

diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 27d12f9a3e1..e521b37c73d 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -262,7 +262,7 @@ TAO_GIOP_Message_Base::dump_consolidated_msg (TAO_OutputCDR &stream, bool hex_du
 }
 
 int
-TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream, TAO_Stub& stub)
+TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream, TAO_Stub* stub)
 {
   this->set_giop_flags (stream);
 
@@ -278,13 +278,13 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream, TAO_Stub& stub)
           this->dump_consolidated_msg (stream, true);
         }
       bool compressed;
-      if (&stub == 0)
+      if (stub)
         {
-          compressed = ziop_adapter->marshal_data (stream, *this->orb_core_);
+          compressed = ziop_adapter->marshal_data (stream, stub);
         }
       else
         {
-          compressed = ziop_adapter->marshal_data (stream, stub);
+          compressed = ziop_adapter->marshal_data (stream, *this->orb_core_);
         }
 
         if (TAO_debug_level >= 5)
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index 150df7cdca9..9ca13c3bfe1 100644
--- a/TAO/tao/GIOP_Message_Base.h
+++ b/TAO/tao/GIOP_Message_Base.h
@@ -85,7 +85,7 @@ public:
   /// Format the message. As we have not written the message length in
   /// the header, we make use of this oppurtunity to insert and format
   /// the message.
-  int format_message (TAO_OutputCDR &cdr, TAO_Stub& stub);
+  int format_message (TAO_OutputCDR &cdr, TAO_Stub* stub);
 
   /**
    * Parse the details of the next message from the @a incoming
@@ -160,7 +160,7 @@ private:
 #if defined (TAO_HAS_ZIOP) && TAO_HAS_ZIOP ==1
   /// Decompresses a ZIOP message and turns it into a GIOP message
   bool decompress (ACE_Data_Block **db, TAO_Queued_Data& qd,
-                                   size_t& rd_pos, size_t& wr_pos);
+                   size_t& rd_pos, size_t& wr_pos);
 #endif
 
 
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index e215d8cc623..fb5912c5528 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -231,7 +231,7 @@ TAO_IIOP_Transport::send_message (TAO_OutputCDR &stream,
                                   ACE_Time_Value *max_wait_time)
 {
   // Format the message in the stream first
-  if (this->messaging_object ()->format_message (stream, *stub) != 0)
+  if (this->messaging_object ()->format_message (stream, stub) != 0)
     return -1;
 
   // This guarantees to send all data (bytes) or return an error.
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index b57595ee8e7..87cc1030ba3 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -251,7 +251,7 @@ TAO_DIOP_Transport::send_message (TAO_OutputCDR &stream,
                                   ACE_Time_Value *max_wait_time)
 {
   // Format the message in the stream first
-  if (this->messaging_object ()->format_message (stream, *stub) != 0)
+  if (this->messaging_object ()->format_message (stream, stub) != 0)
     return -1;
 
   // Strictly speaking, should not need to loop here because the
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index e9ab70bb63c..cc952bce2bb 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -137,7 +137,7 @@ TAO_SCIOP_Transport::send_message (TAO_OutputCDR &stream,
                                    ACE_Time_Value *max_wait_time)
 {
   // Format the message in the stream first
-  if (this->messaging_object ()->format_message (stream) != 0)
+  if (this->messaging_object ()->format_message (stream, stub) != 0)
     return -1;
 
   // This guarantees to send all data (bytes) or return an error.
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index fad20ed3f2e..c7bcf6ba2f7 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -298,7 +298,7 @@ TAO_SHMIOP_Transport::send_message (TAO_OutputCDR &stream,
                                     ACE_Time_Value *max_wait_time)
 {
   // Format the message in the stream first
-  if (this->messaging_object ()->format_message (stream, *stub) != 0)
+  if (this->messaging_object ()->format_message (stream, stub) != 0)
     return -1;
 
   // Strictly speaking, should not need to loop here because the
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index 13041cbe44b..c2d540c4a9e 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -123,7 +123,7 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream,
                                   ACE_Time_Value *max_wait_time)
 {
   // Format the message in the stream first
-  if (this->messaging_object ()->format_message (stream) != 0)
+  if (this->messaging_object ()->format_message (stream, stub) != 0)
     return -1;
 
   // Strictly speaking, should not need to loop here because the
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 703da9b2180..12847baf599 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -96,7 +96,7 @@ namespace TAO
         this->write_header (cdr);
 
         this->marshal_data (cdr);
-        
+
         // Register a reply dispatcher for this invocation. Use the
         // preallocated reply dispatcher.
         TAO_Bind_Dispatcher_Guard dispatch_guard (
@@ -687,8 +687,12 @@ namespace TAO
                       "TAO (%P|%t) - Synch_Oneway_Invocation::"
                       "remote_oneway, queueing message\n"));
 
-        if (transport->format_queue_message (cdr, max_wait_time, *this->resolver_.stub()) != 0)
-          s = TAO_INVOKE_FAILURE;
+        if (transport->format_queue_message (cdr,
+                                             max_wait_time,
+                                             this->resolver_.stub()) != 0)
+          {
+            s = TAO_INVOKE_FAILURE;
+          }
       }
   }
 
diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp
index 5a6613245c3..26f92dc5d37 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Synch_Reply_Dispatcher.cpp
@@ -79,7 +79,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (
 
   // Must reset the message state, it is possible that the same reply
   // dispatcher is used because the request must be re-sent.
-  //this->message_state_.reset (0);
+  // this->message_state_.reset (0);
 
   // Transfer the <params.input_cdr_>'s content to this->reply_cdr_
   if (ACE_BIT_DISABLED ((*params.input_cdr_).start()->data_block()->flags(),
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 45fde50d47f..f4011d541e0 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -560,7 +560,7 @@ TAO_Transport::handle_output (ACE_Time_Value *max_wait_time)
 int
 TAO_Transport::format_queue_message (TAO_OutputCDR &stream,
                                      ACE_Time_Value *max_wait_time,
-                                     TAO_Stub& stub)
+                                     TAO_Stub* stub)
 {
   if (this->messaging_object ()->format_message (stream, stub) != 0)
     return -1;
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 712da3f1f89..8742a63f3e0 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -704,7 +704,7 @@ public:
   ///            block, used in the implementation of timeouts.
   int format_queue_message (TAO_OutputCDR &stream,
                             ACE_Time_Value *max_wait_time,
-                            TAO_Stub& stub);
+                            TAO_Stub* stub);
 
   /// Send a message block chain,
   int send_message_block_chain (const ACE_Message_Block *message_block,