summaryrefslogtreecommitdiff
path: root/TAO/tao/TAO_Server_Request.cpp
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-03-01 08:57:14 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-03-01 08:57:14 +0000
commitf56ae0ae98a5cf4437c7ebdae46a4535e9f46800 (patch)
tree969ebaaf60e8229747a23d5ada35b94ac6dff328 /TAO/tao/TAO_Server_Request.cpp
parent205b07d5df0b093b094cbcca8bf01616583479c5 (diff)
downloadATCD-f56ae0ae98a5cf4437c7ebdae46a4535e9f46800.tar.gz
ChangeLogTag:Tue Mar 1 00:47:51 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/TAO_Server_Request.cpp')
-rw-r--r--TAO/tao/TAO_Server_Request.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 50376438d16..3a6f9f7e23a 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -271,6 +271,9 @@ TAO_ServerRequest::send_no_exception_reply (void)
void
TAO_ServerRequest::tao_send_reply (void)
{
+ if (this->collocated ())
+ return; // No transport in the collocated case.
+
int result = this->transport_->send_message (*this->outgoing_,
0,
TAO_Transport::TAO_REPLY);
@@ -291,7 +294,7 @@ void
TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
{
// int result = 0;
- if (this->response_expected_)
+ if (this->response_expected_ && !this->collocated ())
{
// A copy of the reply parameters
TAO_Pluggable_Reply_Params_Base reply_params;
@@ -334,7 +337,7 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
TAO_DEF_GIOP_MAJOR,
TAO_DEF_GIOP_MINOR);
- this->transport_->assign_translators(0,&output);
+ this->transport_->assign_translators (0, &output);
// Make the reply message
if (this->mesg_base_->generate_exception_reply (*this->outgoing_,
reply_params,