Mon Sep 24 07:43:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 13 insertions, 13 deletions

diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index a4658c28a99..edd6333959b 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -212,7 +212,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
-      server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
+      server_request.pi_reply_status (PortableInterceptor::LOCATION_FORWARD);
       (void) this->send_other (server_request,
                                args,
                                nargs,
@@ -280,7 +280,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
   catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
-      server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
+      server_request.pi_reply_status (PortableInterceptor::LOCATION_FORWARD);
       this->send_other (server_request,
                         args,
                         nargs,
@@ -391,7 +391,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
   catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
-      server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
+      server_request.pi_reply_status (PortableInterceptor::LOCATION_FORWARD);
       this->send_other (server_request,
                         args,
                         nargs,
@@ -483,7 +483,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
-      server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
+      server_request.pi_reply_status (PortableInterceptor::LOCATION_FORWARD);
       this->send_other (server_request,
                         args,
                         nargs,
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index 33383e098e2..a63e7864817 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -108,8 +108,8 @@ TAO::ServerRequestInfo::arguments (void)
       parameter.mode = (*i)->mode ();
       // When we are in receive_request and have an out argument, then
       // don't copy it, just let the any be empty with typecode tk_null
-      if ((this->server_request_.reply_status () != -1) ||
-          (this->server_request_.reply_status () == -1 &&
+      if ((this->server_request_.pi_reply_status () != -1) ||
+          (this->server_request_.pi_reply_status () == -1 &&
            (*i)->mode () != CORBA::PARAM_OUT))
         {
           (*i)->interceptor_value (&parameter.argument);
@@ -203,17 +203,17 @@ TAO::ServerRequestInfo::sync_scope (void)
 PortableInterceptor::ReplyStatus
 TAO::ServerRequestInfo::reply_status (void)
 {
-  if (this->server_request_.reply_status () == -1)
+  if (this->server_request_.pi_reply_status () == -1)
     // A reply hasn't been received yet.
     throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 
-  return this->server_request_.reply_status ();
+  return this->server_request_.pi_reply_status ();
 }
 
 CORBA::Object_ptr
 TAO::ServerRequestInfo::forward_reference (void)
 {
-  if (this->server_request_.reply_status () != PortableInterceptor::LOCATION_FORWARD)
+  if (this->server_request_.pi_reply_status () != PortableInterceptor::LOCATION_FORWARD)
     throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 
   // TAO_ServerRequest::forward_location() already duplicates the
@@ -287,8 +287,8 @@ TAO::ServerRequestInfo::get_service_context_i (
 CORBA::Any *
 TAO::ServerRequestInfo::sending_exception (void)
 {
-  if (this->server_request_.reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
-      && this->server_request_.reply_status () != PortableInterceptor::USER_EXCEPTION)
+  if (this->server_request_.pi_reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
+      && this->server_request_.pi_reply_status () != PortableInterceptor::USER_EXCEPTION)
     {
       throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl
index 09985532ba8..981df1cbdff 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.inl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.inl
@@ -32,7 +32,7 @@ TAO::ServerRequestInfo::forward_reference (
   // Note that we're converting the ForwardRequest exception in to a
   // LOCATION_FORWARD reply, so we do not set the exception status.
 
-  this->server_request_.reply_status (PortableInterceptor::LOCATION_FORWARD);
+  this->server_request_.pi_reply_status (PortableInterceptor::LOCATION_FORWARD);
 
   // Store the forward reference in the TAO_ServerRequest object.
   this->server_request_.forward_location (exc.forward.in ());
@@ -44,7 +44,7 @@ TAO::ServerRequestInfo::forward_reference (CORBA::Object_ptr obj)
   // We only get here if a servant manager threw a
   // PortableServer::ForwardRequest exception.
 
-  this->server_request_.reply_status (PortableInterceptor::LOCATION_FORWARD);
+  this->server_request_.pi_reply_status (PortableInterceptor::LOCATION_FORWARD);
 
   // Store the forward reference in the TAO_ServerRequest object.
   this->server_request_.forward_location (obj);