ChangeLogTag: Tue Apr 12 14:03:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 13 insertions, 25 deletions

diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index ee4d822d116..92143556226 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -171,8 +171,7 @@ TAO_LB_ServerRequestInterceptor::send_other (
         ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      if (status == PortableInterceptor::LOCATION_FORWARD
-          || status == PortableInterceptor::LOCATION_FORWARD_PERMANENT)
+      if (status == PortableInterceptor::LOCATION_FORWARD)
         ACE_DEBUG ((LM_INFO,
                     ACE_TEXT ("TAO_LB_ServerRequestInterceptor -- ")
                     ACE_TEXT ("LOCATION FORWARDED\n")));
diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
index e44b93b2dac..1ce70cdaf4d 100644
--- a/TAO/tao/ClientRequestInfo.h
+++ b/TAO/tao/ClientRequestInfo.h
@@ -119,15 +119,14 @@ public:
   /**
    * Statuses can be PortableInterceptor::SUCCESSFUL,
    * SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD,
-   * LOCATION_FORWARD_PERMANENT, TRANSPORT_RETRY, UNKNOWN.
+   * TRANSPORT_RETRY, UNKNOWN.
    */
   virtual PortableInterceptor::ReplyStatus reply_status (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
-  /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the
-  /// object reference to which the request was forwarded.
+  /// return the object reference to which the request was forwarded.
   virtual CORBA::Object_ptr forward_reference (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
diff --git a/TAO/tao/ClientRequestInfo_i.h b/TAO/tao/ClientRequestInfo_i.h
index bacee9f8ca5..11eec396b1f 100644
--- a/TAO/tao/ClientRequestInfo_i.h
+++ b/TAO/tao/ClientRequestInfo_i.h
@@ -110,15 +110,13 @@ public:
 
   /// Return the reply status for the current request.  Statuses can
   /// be PortableInterceptor::SUCCESSFUL, SYSTEM_EXCEPTION,
-  /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT,
-  /// TRANSPORT_RETRY.
+  /// USER_EXCEPTION, LOCATION_FORWARD, TRANSPORT_RETRY, UNKNOWN
   PortableInterceptor::ReplyStatus reply_status (
       ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
-  /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the
-  /// object reference to which the request was forwarded.
+  /// If the reply status is PortableInterceptor::LOCATION_FORWARD
+  /// return the object reference to which the request was forwarded.
   CORBA::Object_ptr forward_reference (
       ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h
index b5d8de81a31..be092752c3e 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.h
@@ -7,8 +7,7 @@
  *  $Id$
  *
  *   This file an adapter class to simplify the support of
- *   interceptors. This file is a modified form of
- *   ClientInterceptor_Adapter.h
+ *   interceptors.
  *
  *  @author  Nanbor Wang <nanbor@cs.wustl.edu>
  *  @author  Ossama Othman <ossama@uci.edu>
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 4498a39f5ee..388d339e079 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -74,9 +74,8 @@ module PortableInterceptor {
   const ReplyStatus SYSTEM_EXCEPTION = 1;
   const ReplyStatus USER_EXCEPTION = 2;
   const ReplyStatus LOCATION_FORWARD = 3;
-  const ReplyStatus LOCATION_FORWARD_PERMANENT = 4;  // @@ TO BE REMOVED
-  const ReplyStatus TRANSPORT_RETRY = 5;  // @@ TO BE RENUMBERED to 4
-  const ReplyStatus UNKNOWN = 6;          // @@ TO BE RENUMBERED to 5
+  const ReplyStatus TRANSPORT_RETRY = 4;
+  const ReplyStatus UNKNOWN = 5;
 
   typedef unsigned long SlotId;
 
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index eaa4ce1817a..6597aecc022 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -320,17 +320,12 @@ namespace PortableInterceptor
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
-  const PortableInterceptor::ReplyStatus LOCATION_FORWARD_PERMANENT = 4;
+  const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 4;
   
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
-  const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 5;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::ReplyStatus UNKNOWN = 6;
+  const PortableInterceptor::ReplyStatus UNKNOWN = 5;
   
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h
index a8581451999..7323da663f8 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.h
+++ b/TAO/tao/PortableServer/ServerRequestInfo.h
@@ -127,15 +127,14 @@ namespace TAO
     /**
      * Statuses can be @c PortableInterceptor::SUCCESSFUL,
      * @c SYSTEM_EXCEPTION, @c USER_EXCEPTION, @c LOCATION_FORWARD,
-     * @c LOCATION_FORWARD_PERMANENT, @c TRANSPORT_RETRY.
+     * @c TRANSPORT_RETRY, @c UNKNOWN..
      */
     virtual PortableInterceptor::ReplyStatus reply_status (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// If the reply status is
-    /// @c PortableInterceptor::LOCATION_FORWARD or
-    /// @c PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the
+    /// @c PortableInterceptor::LOCATION_FORWARD return the
     /// object reference to which the request was forwarded.
     virtual CORBA::Object_ptr forward_reference (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)