summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-01-03 12:05:26 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-01-03 12:05:26 +0000
commit9630f591ec08d7438ea5970a93626cfa2585ec38 (patch)
tree679afe68e8f11b59db3c52815b9aaa62a8a3db55
parent57fbe4b7ca413d55bfa186ac1f339748c0f79add (diff)
downloadATCD-9630f591ec08d7438ea5970a93626cfa2585ec38.tar.gz
*** empty log message ***
-rw-r--r--TAO/tao/GIOP_Message_Handler.inl19
1 files changed, 9 insertions, 10 deletions
diff --git a/TAO/tao/GIOP_Message_Handler.inl b/TAO/tao/GIOP_Message_Handler.inl
index 37d15d62e2d..bbef0a5b1d6 100644
--- a/TAO/tao/GIOP_Message_Handler.inl
+++ b/TAO/tao/GIOP_Message_Handler.inl
@@ -16,6 +16,9 @@ TAO_GIOP_Message_Handler::data_block (void) const
ACE_INLINE ACE_Data_Block *
TAO_GIOP_Message_Handler::data_block_dup (void)
{
+ if (this->supp_buffer_.length () >0)
+ return this->supp_buffer_.data_block ()->duplicate ();
+
return this->current_buffer_.data_block ()->duplicate ();
}
@@ -48,11 +51,9 @@ TAO_GIOP_Message_Handler::rd_pos (void) const
return
this->supp_buffer_.rd_ptr () - this->supp_buffer_.base ();
}
- else
- {
- return
- this->current_buffer_.rd_ptr () - this->current_buffer_.base ();
- }
+
+ return
+ this->current_buffer_.rd_ptr () - this->current_buffer_.base ();
}
ACE_INLINE size_t
@@ -63,9 +64,7 @@ TAO_GIOP_Message_Handler::wr_pos (void) const
return
this->supp_buffer_.wr_ptr () - this->supp_buffer_.base ();
}
- else
- {
- return
- this->current_buffer_.wr_ptr () - this->current_buffer_.base ();
- }
+
+ return
+ this->current_buffer_.wr_ptr () - this->current_buffer_.base ();
}