ChangeLogTag: Fri Mar 28 15:30:12 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com>

11 files changed, 36 insertions, 21 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8e2678666ec..b38bc86d012 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Fri Mar 28 15:30:12 UTC 2008  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/Invocation_Base.h:
+        * tao/LocateRequest_Invocation_Adapter.cpp:
+        * tao/Invocation_Base.cpp:
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+        * tao/ClientRequestInterceptor_Adapter.h:
+        * tao/Messaging/Asynch_Invocation_Adapter.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.h:
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+        * tao/Invocation_Adapter.cpp:
+
+          Changed reply_status to pi_reply_status as agreed in Bug#2377.
+
 Fri Mar 28 14:57:25 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
 
         * tao/Invocation_Adapter.cpp:
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h
index 95a383058f0..20b07e45377 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.h
@@ -102,7 +102,7 @@ namespace TAO
     virtual void destroy_interceptors (void) = 0;
 
     /// Convert TAO Invocation status to a PI status
-    virtual PortableInterceptor::ReplyStatus reply_status (
+    virtual PortableInterceptor::ReplyStatus pi_reply_status (
       TAO::Invocation_Base const &invocation_base) = 0;
   };
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index 7b2bdb7c259..7723f33cdca 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -142,7 +142,7 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
         CORBA::Boolean const permanent_forward =
-            (synch.reply_status() == GIOP::LOCATION_FORWARD_PERM);
+          (synch.pi_reply_status() == GIOP::LOCATION_FORWARD_PERM);
 #else
         CORBA::Boolean const permanent_forward = false;
 #endif
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index f3dbbb3c383..2d7c4587461 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -172,7 +172,7 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
         CORBA::Boolean const is_permanent_forward =
-            (coll_inv.reply_status() == GIOP::LOCATION_FORWARD_PERM);
+          (coll_inv.pi_reply_status() == GIOP::LOCATION_FORWARD_PERM);
 #else
         CORBA::Boolean const is_permanent_forward = false;
 #endif
@@ -308,7 +308,7 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
         CORBA::Boolean const is_permanent_forward =
-            (synch.reply_status() == GIOP::LOCATION_FORWARD_PERM);
+          (synch.pi_reply_status() == GIOP::LOCATION_FORWARD_PERM);
 #else
         CORBA::Boolean const is_permanent_forward = false;
 #endif
@@ -337,7 +337,7 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
         CORBA::Boolean const is_permanent_forward =
-            (synch.reply_status() == GIOP::LOCATION_FORWARD_PERM);
+          (synch.pi_reply_status() == GIOP::LOCATION_FORWARD_PERM);
 #else
         CORBA::Boolean const is_permanent_forward = false;
 #endif
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index 5e8efd0a774..574c1dbf73d 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -134,7 +134,7 @@ namespace TAO
           }
 
         PortableInterceptor::ReplyStatus const status =
-          this->adapter_->reply_status (*this);
+          this->adapter_->pi_reply_status (*this);
 
         if (status == PortableInterceptor::LOCATION_FORWARD ||
             status == PortableInterceptor::TRANSPORT_RETRY)
@@ -189,7 +189,7 @@ namespace TAO
           }
         else
           {
-            status = this->adapter_->reply_status (*this);
+            status = this->adapter_->pi_reply_status (*this);
           }
       }
 
@@ -208,7 +208,7 @@ namespace TAO
       {
         this->adapter_->receive_exception (*this);
 
-        status = this->adapter_->reply_status (*this);
+        status = this->adapter_->pi_reply_status (*this);
       }
 
     return status;
@@ -228,11 +228,11 @@ namespace TAO
   }
 
   PortableInterceptor::ReplyStatus
-  Invocation_Base::reply_status (void) const
+  Invocation_Base::pi_reply_status (void) const
   {
     if (adapter_ != 0)
       {
-        return this->adapter_->reply_status (*this);
+        return this->adapter_->pi_reply_status (*this);
       }
     else
       {
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
index 1e8139fb1c5..adc6d0d8aa2 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -192,7 +192,7 @@ namespace TAO
     /// Invoke status
     TAO::Invocation_Status invoke_status (void) const;
 
-    PortableInterceptor::ReplyStatus reply_status (void) const;
+    PortableInterceptor::ReplyStatus pi_reply_status (void) const;
 
     /// Accessor used to determine if the current invocation is part
     /// of a remote request, and if not, it will be considered to be
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
index 73854c092df..25b3823945d 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
@@ -86,7 +86,7 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
                 CORBA::Boolean const is_permanent_forward =
-                  (synch.reply_status() == GIOP::LOCATION_FORWARD_PERM);
+                  (synch.pi_reply_status() == GIOP::LOCATION_FORWARD_PERM);
 #else
                 CORBA::Boolean const is_permanent_forward = false;
 #endif
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
index aa6216f76ba..b1e31e1027a 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -198,7 +198,7 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
         CORBA::Boolean const permanent_forward =
-            (asynch.reply_status() == GIOP::LOCATION_FORWARD_PERM);
+          (asynch.pi_reply_status() == GIOP::LOCATION_FORWARD_PERM);
 #else
         CORBA::Boolean const permanent_forward = false;
 #endif
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index 0e65221c825..fce3aa2aae2 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -138,8 +138,8 @@ TAO_ClientRequestInfo::received_exception (void)
 {
   this->check_validity ();
 
-  if (this->invocation_->reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
-      && this->invocation_->reply_status () != PortableInterceptor::USER_EXCEPTION)
+  if (this->invocation_->pi_reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
+      && this->invocation_->pi_reply_status () != PortableInterceptor::USER_EXCEPTION)
     {
       throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
@@ -554,7 +554,7 @@ TAO_ClientRequestInfo::reply_status (void)
   this->check_validity ();
 
   PortableInterceptor::ReplyStatus const status =
-    this->invocation_->reply_status();
+    this->invocation_->pi_reply_status();
   if (status == -1 || status == PortableInterceptor::UNKNOWN)
     {
       // A reply hasn't been received yet.
@@ -569,7 +569,7 @@ TAO_ClientRequestInfo::forward_reference (void)
 {
   this->check_validity ();
 
-  if (this->invocation_->reply_status() != PortableInterceptor::LOCATION_FORWARD)
+  if (this->invocation_->pi_reply_status() != PortableInterceptor::LOCATION_FORWARD)
     {
       throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index bab61d1e201..a5bc7e98540 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -152,7 +152,7 @@ namespace TAO
         this->receive_exception (invocation);
 
         PortableInterceptor::ReplyStatus status =
-          this->reply_status (invocation);
+          this->pi_reply_status (invocation);
 
         // Only re-throw the exception if it hasn't been transformed by
         // the receive_exception() interception point (e.g. to a
@@ -221,7 +221,7 @@ namespace TAO
         this->receive_exception (invocation);
 
         PortableInterceptor::ReplyStatus status =
-          this->reply_status (invocation);
+          this->pi_reply_status (invocation);
 
         // Only re-throw the exception if it hasn't been transformed by
         // the receive_exception() interception point (e.g. to a
@@ -265,7 +265,7 @@ namespace TAO
   }
 
   PortableInterceptor::ReplyStatus
-  ClientRequestInterceptor_Adapter_Impl::reply_status (
+  ClientRequestInterceptor_Adapter_Impl::pi_reply_status (
     TAO::Invocation_Base const &invocation_base)
   {
     PortableInterceptor::ReplyStatus reply_status;
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index 3c700cfe66e..f63e902779a 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -104,7 +104,7 @@ namespace TAO
 
     virtual void destroy_interceptors (void);
 
-    virtual PortableInterceptor::ReplyStatus reply_status (
+    virtual PortableInterceptor::ReplyStatus pi_reply_status (
       TAO::Invocation_Base const &invocation_base);
 
   protected: