summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2012-03-22 11:12:34 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2012-03-22 11:12:34 +0000
commit45b462fb02d0824032ecc9cdce94e16d29e94087 (patch)
treeb34473037a1949ac616322cf513d5ae866532b29 /TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
parenta74789f4233449239a03e79e1a810ca54df93946 (diff)
downloadATCD-45b462fb02d0824032ecc9cdce94e16d29e94087.tar.gz
Thu Mar 22 11:10:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com>
* orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp: * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h: * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp: * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h: * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h: * tao/GIOP_Message_Base.cpp: * tao/GIOP_Message_Base.h: * tao/IIOP_Transport.cpp: * tao/IIOP_Transport.h: * tao/Messaging/AMH_Response_Handler.cpp: * tao/On_Demand_Fragmentation_Strategy.cpp: * tao/TAO_Server_Request.cpp: * tao/Transport.cpp: * tao/Transport.h: * tao/ZIOP_Adapter.h: * tao/Strategies/DIOP_Transport.cpp: * tao/Strategies/DIOP_Transport.h: * tao/Strategies/SHMIOP_Transport.cpp: * tao/Strategies/SHMIOP_Transport.h: * tao/Strategies/UIOP_Transport.cpp: * tao/Strategies/UIOP_Transport.h: * tao/ZIOP/ZIOP.cpp: * tao/ZIOP/ZIOP.h: * tests/Bug_3531b_Regression/server.cpp: Provide a pointer to the TAO_ServerRequest object down to TAO_GIOP_Message_Base::format_message() and TAO_ZIOP_LOADER::marshal_data () for server reply. Note this once more changes the transport send_message() api for ZIOP (and other furture uses) to add a possiable TAO_ServerRequest object as well as the possiable stub object. This lets the send_message access the client provided policies that control how the message is being dealt with.
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 1e5f5c3996b..c6df3ae8d8c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -123,6 +123,7 @@ TAO::SSLIOP::Transport::send_request (TAO_Stub *stub,
if (this->send_message (stream,
stub,
+ 0,
message_semantics,
max_wait_time) == -1)
@@ -134,11 +135,12 @@ TAO::SSLIOP::Transport::send_request (TAO_Stub *stub,
int
TAO::SSLIOP::Transport::send_message (TAO_OutputCDR &stream,
TAO_Stub *stub,
+ TAO_ServerRequest *request,
TAO_Message_Semantics message_semantics,
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, request) != 0)
return -1;
// Strictly speaking, should not need to loop here because the