ChangeLogTag:Tue Mar 16 00:49:15 2004 Ossama Othman <ossama@dre.vanderbilt.edu>

8 files changed, 1784 insertions, 1198 deletions

diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp
index 83899b0e823..9baa62a9bbf 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS.cpp
@@ -51,7 +51,7 @@
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
-#include "tao/PICurrent.h"
+#include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -705,30 +705,30 @@ public:
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * server_;
   const char * activator_;
 };
@@ -760,19 +760,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activa
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -786,14 +786,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activa
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -805,7 +805,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activa
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -816,7 +816,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activa
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -854,45 +854,45 @@ public:
       const char * activator
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * server_;
   const char * activator_;
 };
@@ -924,19 +924,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -950,14 +950,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -969,7 +969,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -980,7 +980,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1019,47 +1019,47 @@ public:
       const ImplementationRepository::Locator::ServerNameList & servers
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   void result (CORBA::Long result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * activator_;
   ImplementationRepository::Administration_ptr admin_;
   const ImplementationRepository::Locator::ServerNameList & servers_;
@@ -1095,23 +1095,23 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::argum
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (3);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->admin_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->servers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1125,11 +1125,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::excep
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1140,11 +1140,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::resul
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
-  
+
   return safe_result_any._retn ();
 }
 
@@ -1168,7 +1168,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::targe
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::result (CORBA::Long result)
 {
   // Update the result.
@@ -1189,45 +1189,45 @@ public:
       const CORBA::Long & token
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * activator_;
   const CORBA::Long & token_;
 };
@@ -1259,19 +1259,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::arg
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= token_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1285,11 +1285,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::exc
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1300,7 +1300,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::res
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1340,45 +1340,45 @@ public:
       ImplementationRepository::ServerObject_ptr server_object
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * server_;
   const char * activator_;
   const char * addr_;
@@ -1416,27 +1416,27 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_acti
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= addr_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->server_object_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1450,14 +1450,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_acti
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -1469,7 +1469,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_acti
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1480,7 +1480,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_acti
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1518,45 +1518,45 @@ public:
       const char * activator
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * server_;
   const char * activator_;
 };
@@ -1588,19 +1588,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator::argume
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1614,14 +1614,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator::except
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -1633,7 +1633,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator::except
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1644,7 +1644,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator::result
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1683,7 +1683,7 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::the_TAO_Loc
 {
   static POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -1705,7 +1705,7 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::get_strateg
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -1725,10 +1725,10 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::dispatch (
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  
+
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-  
+
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -1738,29 +1738,29 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::dispatch (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-  
+
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-  
+
   if (status == -1)
     {
       ACE_THROW (CORBA::BAD_OPERATION ());
     }
-  
+
   ACE_TRY
     {
       collocated_skel (servant,
@@ -1804,9 +1804,9 @@ ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function (CORBA::Obje
 int
 ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer = 
+  ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1832,14 +1832,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::_TAO_Locator_Thru
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1861,14 +1861,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_i
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1889,14 +1889,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server_in_
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1917,14 +1917,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server_i
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1945,14 +1945,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shuttin
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1974,14 +1974,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_activato
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unregister_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2001,14 +2001,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unregister_activa
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_running_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2031,14 +2031,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_running
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2071,14 +2071,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find_in_activator
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::_TAO_Locator_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2098,14 +2098,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_in
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2124,14 +2124,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server_in_a
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2150,14 +2150,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server_in
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2176,14 +2176,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2203,14 +2203,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_activator
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unregister_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2228,14 +2228,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unregister_activat
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_running_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2256,14 +2256,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_running_
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2289,7 +2289,7 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find_in_activator
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:97
 
 POA_ImplementationRepository::Locator::Locator (void)
@@ -2308,7 +2308,7 @@ POA_ImplementationRepository::Locator::~Locator (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::activate_server_in_activator_skel (
@@ -2325,10 +2325,10 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ())
@@ -2337,46 +2337,46 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->activate_server_in_activator (
                   server.in (),
-                  
+
                   activator.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -2384,7 +2384,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2400,35 +2400,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -2436,14 +2436,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::remove_server_in_activator_skel (
@@ -2460,10 +2460,10 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ())
@@ -2472,46 +2472,46 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->remove_server_in_activator (
                   server.in (),
-                  
+
                   activator.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -2519,7 +2519,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2535,35 +2535,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -2571,14 +2571,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::shutdown_server_in_activator_skel (
@@ -2595,10 +2595,10 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ())
@@ -2607,46 +2607,46 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->shutdown_server_in_activator (
                   server.in (),
-                  
+
                   activator.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -2654,7 +2654,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2670,35 +2670,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -2706,14 +2706,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::server_is_shutting_down_in_activator_skel (
@@ -2730,10 +2730,10 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ())
@@ -2742,46 +2742,46 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->server_is_shutting_down_in_activator (
                   server.in (),
-                  
+
                   activator.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -2789,7 +2789,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2805,35 +2805,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -2841,14 +2841,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::register_activator_skel (
@@ -2868,7 +2868,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
   CORBA::String_var activator;
   ImplementationRepository::Administration_var admin;
   ImplementationRepository::Locator::ServerNameList servers;
-  
+
   if (!(
       (_tao_in >> activator.out ()) &&
       (_tao_in >> admin.out ()) &&
@@ -2878,50 +2878,50 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       activator.in (),
-      
+
       admin.in (),
-      
+
       servers
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval = 
+            _tao_retval =
               _tao_impl->register_activator (
                   activator.in (),
-                  
+
                   admin.in (),
-                  
+
                   servers
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -2929,7 +2929,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::Long _tao_retval_info = _tao_retval;
@@ -2947,35 +2947,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -2983,11 +2983,11 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << _tao_retval)
       ))
@@ -2995,12 +2995,12 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::unregister_activator_skel (
@@ -3017,10 +3017,10 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var activator;
   CORBA::Long token;
-  
+
   if (!(
       (_tao_in >> activator.out ()) &&
       (_tao_in >> token)
@@ -3029,46 +3029,46 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       activator.in (),
-      
+
       token
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->unregister_activator (
                   activator.in (),
-                  
+
                   token
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -3076,7 +3076,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3092,35 +3092,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -3128,14 +3128,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::server_is_running_in_activator_skel (
@@ -3152,12 +3152,12 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
   CORBA::String_var addr;
   ImplementationRepository::ServerObject_var server_object;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ()) &&
@@ -3168,54 +3168,54 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in (),
-      
+
       addr.in (),
-      
+
       server_object.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->server_is_running_in_activator (
                   server.in (),
-                  
+
                   activator.in (),
-                  
+
                   addr.in (),
-                  
+
                   server_object.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -3223,7 +3223,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3239,35 +3239,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -3275,14 +3275,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::find_in_activator_skel (
@@ -3298,11 +3298,11 @@ POA_ImplementationRepository::Locator *_tao_impl =
         POA_ImplementationRepository::Locator *,
         _tao_servant
       );
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
   ImplementationRepository::ServerInformation_var info;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ())
@@ -3311,48 +3311,48 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->find_in_activator (
                   server.in (),
-                  
+
                   activator.in (),
-                  
+
                   info.out ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -3360,7 +3360,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3376,35 +3376,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -3412,11 +3412,11 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << info.in ())
       ))
@@ -3424,40 +3424,40 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_ImplementationRepository::Locator::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  
+
   POA_ImplementationRepository::Locator *_tao_impl =
     (POA_ImplementationRepository::Locator *) _tao_servant;
-  
+
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-  
+
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-  
+
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -3465,7 +3465,7 @@ void POA_ImplementationRepository::Locator::_is_a_skel (
 }
 
 void POA_ImplementationRepository::Locator::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -3473,14 +3473,14 @@ void POA_ImplementationRepository::Locator::_non_existent_skel (
 {
   POA_ImplementationRepository::Locator *_tao_impl =
     (POA_ImplementationRepository::Locator *) _tao_servant;
-  
+
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -3488,7 +3488,7 @@ void POA_ImplementationRepository::Locator::_non_existent_skel (
 }
 
 void POA_ImplementationRepository::Locator::_interface_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -3498,30 +3498,30 @@ void POA_ImplementationRepository::Locator::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-  
+
   POA_ImplementationRepository::Locator *_tao_impl =
     (POA_ImplementationRepository::Locator *) _tao_servant;
-  
-  CORBA::InterfaceDef_ptr _tao_retval = 
+
+  CORBA::InterfaceDef_ptr _tao_retval =
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -3529,7 +3529,7 @@ void POA_ImplementationRepository::Locator::_interface_skel (
 }
 
 void POA_ImplementationRepository::Locator::_component_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -3537,14 +3537,14 @@ void POA_ImplementationRepository::Locator::_component_skel (
 {
   POA_ImplementationRepository::Locator *_tao_impl =
     (POA_ImplementationRepository::Locator *) _tao_object_reference;
-  
+
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << _tao_retval.in ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -3588,19 +3588,19 @@ void* POA_ImplementationRepository::Locator::_downcast (
     {
       return ACE_static_cast (POA_ImplementationRepository::Administration_ptr, this);
     }
-  
+
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:ImplementationRepository/Locator:1.0") == 0)
     {
       return ACE_static_cast (POA_ImplementationRepository::Locator_ptr, this);
     }
-  
+
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
       return ACE_static_cast (PortableServer::Servant, this);
     }
-  
+
   return 0;
 }
 
@@ -3632,10 +3632,10 @@ POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -3652,10 +3652,10 @@ POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::ImplementationRepository::Locator STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3667,7 +3667,7 @@ POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
 // TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_root/root.cpp:1777
 
-#if 0 
+#if 0
 /* Useful at a later date.
 At present will be commented out */
 
@@ -3914,8 +3914,8 @@ At present will be commented out */
         ImplementationRepository::ServerInformation_out \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-#endif /*if 0*/ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /*if 0*/
 
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index d3d6d5287af..bde823eb284 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -52,7 +52,7 @@
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
-#include "tao/PICurrent.h"
+#include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -679,9 +679,9 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA:
 int
 ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = 
+  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -707,14 +707,14 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerO
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -732,14 +732,14 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -768,14 +768,14 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerObject_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -791,14 +791,14 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -820,7 +820,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:97
 
 POA_ImplementationRepository::ServerObject::ServerObject (void)
@@ -838,7 +838,7 @@ POA_ImplementationRepository::ServerObject::~ServerObject (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::ServerObject::ping_skel (
@@ -854,40 +854,40 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
-  
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->ping (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -895,7 +895,7 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -911,35 +911,35 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -947,14 +947,14 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::ServerObject::shutdown_skel (
@@ -970,40 +970,40 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
-  
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->shutdown (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -1011,7 +1011,7 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -1027,35 +1027,35 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -1063,42 +1063,42 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_ImplementationRepository::ServerObject::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  
+
   POA_ImplementationRepository::ServerObject *_tao_impl =
     (POA_ImplementationRepository::ServerObject *) _tao_servant;
-  
+
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-  
+
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-  
+
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1106,7 +1106,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
 }
 
 void POA_ImplementationRepository::ServerObject::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1114,14 +1114,14 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel (
 {
   POA_ImplementationRepository::ServerObject *_tao_impl =
     (POA_ImplementationRepository::ServerObject *) _tao_servant;
-  
+
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1129,7 +1129,7 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel (
 }
 
 void POA_ImplementationRepository::ServerObject::_interface_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1139,30 +1139,30 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-  
+
   POA_ImplementationRepository::ServerObject *_tao_impl =
     (POA_ImplementationRepository::ServerObject *) _tao_servant;
-  
-  CORBA::InterfaceDef_ptr _tao_retval = 
+
+  CORBA::InterfaceDef_ptr _tao_retval =
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1170,7 +1170,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
 }
 
 void POA_ImplementationRepository::ServerObject::_component_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1178,14 +1178,14 @@ void POA_ImplementationRepository::ServerObject::_component_skel (
 {
   POA_ImplementationRepository::ServerObject *_tao_impl =
     (POA_ImplementationRepository::ServerObject *) _tao_object_reference;
-  
+
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << _tao_retval.in ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1225,13 +1225,13 @@ void* POA_ImplementationRepository::ServerObject::_downcast (
     {
       return ACE_static_cast (POA_ImplementationRepository::ServerObject_ptr, this);
     }
-  
+
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
       return ACE_static_cast (PortableServer::Servant, this);
     }
-  
+
   return 0;
 }
 
@@ -1263,10 +1263,10 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -1283,10 +1283,10 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::ImplementationRepository::ServerObject STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1440,45 +1440,45 @@ public:
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
+
   const char * server_;
 };
 
@@ -1507,15 +1507,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1529,15 +1529,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound,
     ImplementationRepository::_tc_CannotActivate
   };
-  
+
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -1549,7 +1549,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1560,7 +1560,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1598,47 +1598,47 @@ public:
       const CORBA::Long & check_startup
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   void result (char * result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
+
   const char * server_;
   const CORBA::Long & check_startup_;
   char * _result;
@@ -1671,19 +1671,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= check_startup_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1697,15 +1697,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound,
     ImplementationRepository::_tc_CannotActivate
   };
-  
+
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -1717,7 +1717,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1728,11 +1728,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
-  
+
   return safe_result_any._retn ();
 }
 
@@ -1756,7 +1756,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (char * result)
 {
   // Update the result.
@@ -1777,45 +1777,45 @@ public:
       const ImplementationRepository::StartupOptions & options
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
+
   const char * server_;
   const ImplementationRepository::StartupOptions & options_;
 };
@@ -1847,19 +1847,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1873,15 +1873,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] =
   {
     ImplementationRepository::_tc_AlreadyRegistered,
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -1893,7 +1893,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1904,7 +1904,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1942,45 +1942,45 @@ public:
       const ImplementationRepository::StartupOptions & options
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
+
   const char * server_;
   const ImplementationRepository::StartupOptions & options_;
 };
@@ -2012,19 +2012,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2038,15 +2038,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_reregister_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_reregister_server_exceptiondata[] =
   {
     ImplementationRepository::_tc_AlreadyRegistered,
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -2058,7 +2058,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2069,7 +2069,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2106,45 +2106,45 @@ public:
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
+
   const char * server_;
 };
 
@@ -2173,15 +2173,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arg
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2195,14 +2195,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2214,7 +2214,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2225,7 +2225,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::res
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2262,45 +2262,45 @@ public:
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
+
   const char * server_;
 };
 
@@ -2329,15 +2329,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2351,14 +2351,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2370,7 +2370,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2381,7 +2381,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2420,45 +2420,45 @@ public:
       ImplementationRepository::ServerObject_ptr server_object
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
+
   const char * server_;
   const char * addr_;
   ImplementationRepository::ServerObject_ptr server_object_;
@@ -2493,23 +2493,23 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (3);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= addr_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->server_object_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2523,14 +2523,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2542,7 +2542,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2553,7 +2553,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2590,45 +2590,45 @@ public:
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
+
   const char * server_;
 };
 
@@ -2657,15 +2657,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2679,14 +2679,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2698,7 +2698,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2709,7 +2709,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2746,45 +2746,45 @@ public:
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
+
   const char * server_;
 };
 
@@ -2813,15 +2813,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2835,14 +2835,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2854,7 +2854,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2865,7 +2865,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2899,50 +2899,50 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
-      const CORBA::ULong & how_many      
+      const CORBA::ULong & how_many
 
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
-  const CORBA::ULong & how_many_;  
+
+  const CORBA::ULong & how_many_;
 
 };
 
@@ -2953,13 +2953,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const CORBA::ULong & how_many    
+    const CORBA::ULong & how_many
 
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
-    how_many_ (how_many)  
+    how_many_ (how_many)
 
 {}
 
@@ -2973,15 +2973,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    
+
 
   return safe_parameter_list._retn ();
 }
@@ -2996,11 +2996,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -3011,7 +3011,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -3048,47 +3048,47 @@ public:
       const char * object_name
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   void result (char * result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior &
     );
-  
+
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  
+
   const char * object_name_;
   char * _result;
 };
@@ -3118,15 +3118,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior::argument
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= object_name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -3140,14 +3140,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior::exceptio
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_ior_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_ior_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3159,7 +3159,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior::exceptio
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -3170,11 +3170,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
-  
+
   return safe_result_any._retn ();
 }
 
@@ -3198,7 +3198,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior::target_i
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior::result (char * result)
 {
   // Update the result.
@@ -3220,7 +3220,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_
 {
   static POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -3242,7 +3242,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::get_
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -3262,10 +3262,10 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::disp
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  
+
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-  
+
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -3275,29 +3275,29 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::disp
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-  
+
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-  
+
   if (status == -1)
     {
       ACE_THROW (CORBA::BAD_OPERATION ());
     }
-  
+
   ACE_TRY
     {
       collocated_skel (servant,
@@ -3341,9 +3341,9 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORB
 int
 ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = 
+  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3369,14 +3369,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Admin
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3397,14 +3397,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_s
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3427,14 +3427,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_s
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3456,14 +3456,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_s
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3485,14 +3485,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3512,14 +3512,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_ser
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3539,14 +3539,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_s
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3568,14 +3568,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3595,14 +3595,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3623,14 +3623,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3651,14 +3651,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find_ior (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3690,14 +3690,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find_ior (
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Administration_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3716,14 +3716,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_se
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3744,14 +3744,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_se
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3771,14 +3771,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_se
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3798,14 +3798,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3823,14 +3823,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_serv
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3848,14 +3848,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_se
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3875,14 +3875,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_r
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3900,14 +3900,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_s
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3926,14 +3926,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3952,14 +3952,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find_ior (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3984,7 +3984,7 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find_ior (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:97
 
 POA_ImplementationRepository::Administration::Administration (void)
@@ -4002,7 +4002,7 @@ POA_ImplementationRepository::Administration::~Administration (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::activate_server_skel (
@@ -4019,9 +4019,9 @@ POA_ImplementationRepository::Administration *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
-  
+
   if (!(
       (_tao_in >> server.out ())
       ))
@@ -4029,41 +4029,41 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->activate_server (
                   server.in ()
                   ACE_ENV_ARG_PARAMETER
@@ -4072,7 +4072,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4088,35 +4088,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -4124,14 +4124,14 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::activate_server_with_startup_skel (
@@ -4150,7 +4150,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
   CORBA::String_var _tao_retval;
   CORBA::String_var server;
   CORBA::Long check_startup;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> check_startup)
@@ -4159,46 +4159,46 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       check_startup
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval = 
+            _tao_retval =
               _tao_impl->activate_server_with_startup (
                   server.in (),
-                  
+
                   check_startup
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -4206,7 +4206,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           char * _tao_retval_info = _tao_retval._retn ();
@@ -4225,35 +4225,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -4261,11 +4261,11 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << _tao_retval.in ())
       ))
@@ -4273,12 +4273,12 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::register_server_skel (
@@ -4295,10 +4295,10 @@ POA_ImplementationRepository::Administration *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   ImplementationRepository::StartupOptions options;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> options)
@@ -4307,46 +4307,46 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       options
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->register_server (
                   server.in (),
-                  
+
                   options
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -4354,7 +4354,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4370,35 +4370,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -4406,14 +4406,14 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::reregister_server_skel (
@@ -4430,10 +4430,10 @@ POA_ImplementationRepository::Administration *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   ImplementationRepository::StartupOptions options;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> options)
@@ -4442,46 +4442,46 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       options
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->reregister_server (
                   server.in (),
-                  
+
                   options
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -4489,7 +4489,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4505,35 +4505,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -4541,14 +4541,14 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::remove_server_skel (
@@ -4565,9 +4565,9 @@ POA_ImplementationRepository::Administration *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
-  
+
   if (!(
       (_tao_in >> server.out ())
       ))
@@ -4575,41 +4575,41 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->remove_server (
                   server.in ()
                   ACE_ENV_ARG_PARAMETER
@@ -4618,7 +4618,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4634,35 +4634,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -4670,14 +4670,14 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::shutdown_server_skel (
@@ -4694,9 +4694,9 @@ POA_ImplementationRepository::Administration *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
-  
+
   if (!(
       (_tao_in >> server.out ())
       ))
@@ -4704,41 +4704,41 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->shutdown_server (
                   server.in ()
                   ACE_ENV_ARG_PARAMETER
@@ -4747,7 +4747,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4763,35 +4763,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -4799,14 +4799,14 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::server_is_running_skel (
@@ -4823,11 +4823,11 @@ POA_ImplementationRepository::Administration *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var addr;
   ImplementationRepository::ServerObject_var server_object;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> addr.out ()) &&
@@ -4837,50 +4837,50 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       addr.in (),
-      
+
       server_object.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->server_is_running (
                   server.in (),
-                  
+
                   addr.in (),
-                  
+
                   server_object.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -4888,7 +4888,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4904,35 +4904,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -4940,14 +4940,14 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
@@ -4964,9 +4964,9 @@ POA_ImplementationRepository::Administration *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
-  
+
   if (!(
       (_tao_in >> server.out ())
       ))
@@ -4974,41 +4974,41 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->server_is_shutting_down (
                   server.in ()
                   ACE_ENV_ARG_PARAMETER
@@ -5017,7 +5017,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -5033,35 +5033,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -5069,14 +5069,14 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::find_skel (
@@ -5092,10 +5092,10 @@ POA_ImplementationRepository::Administration *_tao_impl =
         POA_ImplementationRepository::Administration *,
         _tao_servant
       );
-  
+
   CORBA::String_var server;
   ImplementationRepository::ServerInformation_var info;
-  
+
   if (!(
       (_tao_in >> server.out ())
       ))
@@ -5103,44 +5103,44 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_find _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->find (
                   server.in (),
-                  
+
                   info.out ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -5148,7 +5148,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -5164,35 +5164,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -5200,11 +5200,11 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << info.in ())
       ))
@@ -5212,12 +5212,12 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::list_skel (
@@ -5233,12 +5233,12 @@ POA_ImplementationRepository::Administration *_tao_impl =
         POA_ImplementationRepository::Administration *,
         _tao_servant
       );
-  
+
   CORBA::ULong how_many;
   ImplementationRepository::ServerInformationList_var server_list;
-  
+
   ImplementationRepository::ServerInformationIterator_var server_iterator;
-  
+
   if (!(
       (_tao_in >> how_many)
       ))
@@ -5246,47 +5246,47 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_list _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
-      how_many      
+
+      how_many
 
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->list (
                   how_many,
-                  
+
                   server_list.out (),
-                  
+
                   server_iterator.out ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -5294,7 +5294,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -5310,35 +5310,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -5346,11 +5346,11 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << server_list.in ()) &&
       (_tao_out << server_iterator.in ())
@@ -5359,12 +5359,12 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::find_ior_skel (
@@ -5382,7 +5382,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
       );
   CORBA::String_var _tao_retval;
   CORBA::String_var object_name;
-  
+
   if (!(
       (_tao_in >> object_name.out ())
       ))
@@ -5390,41 +5390,41 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Administration_find_ior _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       object_name.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval = 
+            _tao_retval =
               _tao_impl->find_ior (
                   object_name.in ()
                   ACE_ENV_ARG_PARAMETER
@@ -5433,7 +5433,7 @@ POA_ImplementationRepository::Administration *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           char * _tao_retval_info = _tao_retval._retn ();
@@ -5452,35 +5452,35 @@ POA_ImplementationRepository::Administration *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -5488,11 +5488,11 @@ POA_ImplementationRepository::Administration *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << _tao_retval.in ())
       ))
@@ -5500,40 +5500,40 @@ POA_ImplementationRepository::Administration *_tao_impl =
       TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_ImplementationRepository::Administration::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  
+
   POA_ImplementationRepository::Administration *_tao_impl =
     (POA_ImplementationRepository::Administration *) _tao_servant;
-  
+
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-  
+
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-  
+
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -5541,7 +5541,7 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
 }
 
 void POA_ImplementationRepository::Administration::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -5549,14 +5549,14 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
 {
   POA_ImplementationRepository::Administration *_tao_impl =
     (POA_ImplementationRepository::Administration *) _tao_servant;
-  
+
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -5564,7 +5564,7 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
 }
 
 void POA_ImplementationRepository::Administration::_interface_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -5574,30 +5574,30 @@ void POA_ImplementationRepository::Administration::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-  
+
   POA_ImplementationRepository::Administration *_tao_impl =
     (POA_ImplementationRepository::Administration *) _tao_servant;
-  
-  CORBA::InterfaceDef_ptr _tao_retval = 
+
+  CORBA::InterfaceDef_ptr _tao_retval =
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -5605,7 +5605,7 @@ void POA_ImplementationRepository::Administration::_interface_skel (
 }
 
 void POA_ImplementationRepository::Administration::_component_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -5613,14 +5613,14 @@ void POA_ImplementationRepository::Administration::_component_skel (
 {
   POA_ImplementationRepository::Administration *_tao_impl =
     (POA_ImplementationRepository::Administration *) _tao_object_reference;
-  
+
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << _tao_retval.in ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -5660,13 +5660,13 @@ void* POA_ImplementationRepository::Administration::_downcast (
     {
       return ACE_static_cast (POA_ImplementationRepository::Administration_ptr, this);
     }
-  
+
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
       return ACE_static_cast (PortableServer::Servant, this);
     }
-  
+
   return 0;
 }
 
@@ -5698,10 +5698,10 @@ POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -5718,10 +5718,10 @@ POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::ImplementationRepository::Administration STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -5860,47 +5860,47 @@ public:
       const CORBA::ULong & how_many
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   void result (CORBA::Boolean result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &
     );
-  
+
 private:
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
-  
+
   const CORBA::ULong & how_many_;
   CORBA::Boolean _result;
 };
@@ -5930,15 +5930,15 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -5952,11 +5952,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -5967,11 +5967,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
+
   return safe_result_any._retn ();
 }
 
@@ -5995,7 +5995,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
 {
   // Update the result.
@@ -6014,45 +6014,45 @@ public:
       POA_ImplementationRepository::ServerInformationIterator *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &
     );
-  
+
 private:
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
-  
+
 };
 
 // TAO_IDL - Generated from
@@ -6078,7 +6078,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -6092,11 +6092,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -6107,7 +6107,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -6146,7 +6146,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 {
   static POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -6168,7 +6168,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -6188,10 +6188,10 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  
+
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-  
+
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -6201,29 +6201,29 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-  
+
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-  
+
   if (status == -1)
     {
       ACE_THROW (CORBA::BAD_OPERATION ());
     }
-  
+
   ACE_TRY
     {
       collocated_skel (servant,
@@ -6267,9 +6267,9 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_fun
 int
 ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = 
+  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -6295,14 +6295,14 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl:
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6323,14 +6323,14 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl:
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6359,14 +6359,14 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl:
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::_TAO_ServerInformationIterator_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6385,14 +6385,14 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6414,7 +6414,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:97
 
 POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
@@ -6432,7 +6432,7 @@ POA_ImplementationRepository::ServerInformationIterator::~ServerInformationItera
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
@@ -6451,8 +6451,8 @@ POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
   CORBA::Boolean _tao_retval = 0;
   CORBA::ULong how_many;
   ImplementationRepository::ServerInformationList_var server_list;
-  
-  
+
+
   if (!(
       (_tao_in >> how_many)
       ))
@@ -6460,44 +6460,44 @@ POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       how_many
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval = 
+            _tao_retval =
               _tao_impl->next_n (
                   how_many,
-                  
+
                   server_list.out ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -6505,7 +6505,7 @@ POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::Boolean _tao_retval_info = _tao_retval;
@@ -6523,35 +6523,35 @@ POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -6559,11 +6559,11 @@ POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << CORBA::Any::from_boolean (_tao_retval)) &&
       (_tao_out << server_list.in ())
@@ -6572,12 +6572,12 @@ POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
       TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
@@ -6593,40 +6593,40 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
-  
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->destroy (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -6634,7 +6634,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -6650,35 +6650,35 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -6686,42 +6686,42 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  
+
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
     (POA_ImplementationRepository::ServerInformationIterator *) _tao_servant;
-  
+
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-  
+
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-  
+
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -6729,7 +6729,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
 }
 
 void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -6737,14 +6737,14 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
 {
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
     (POA_ImplementationRepository::ServerInformationIterator *) _tao_servant;
-  
+
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -6752,7 +6752,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
 }
 
 void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -6762,30 +6762,30 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-  
+
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
     (POA_ImplementationRepository::ServerInformationIterator *) _tao_servant;
-  
-  CORBA::InterfaceDef_ptr _tao_retval = 
+
+  CORBA::InterfaceDef_ptr _tao_retval =
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -6793,7 +6793,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
 }
 
 void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -6801,14 +6801,14 @@ void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
 {
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
     (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference;
-  
+
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << _tao_retval.in ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -6848,13 +6848,13 @@ void* POA_ImplementationRepository::ServerInformationIterator::_downcast (
     {
       return ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator_ptr, this);
     }
-  
+
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
       return ACE_static_cast (PortableServer::Servant, this);
     }
-  
+
   return 0;
 }
 
@@ -6886,10 +6886,10 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -6906,10 +6906,10 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
           0
         );
     }
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::ImplementationRepository::ServerInformationIterator STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6921,7 +6921,7 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
 // TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_root/root.cpp:1777
 
-#if 0 
+#if 0
 /* Useful at a later date.
 At present will be commented out */
 
@@ -7126,8 +7126,8 @@ At present will be commented out */
         ImplementationRepository::ServerInformationIterator_out \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-#endif /*if 0*/ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /*if 0*/
 
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile
index 8bd50656de8..0a937ad92c7 100644
--- a/TAO/tao/PortableServer/Makefile
+++ b/TAO/tao/PortableServer/Makefile
@@ -39,6 +39,7 @@ CPP_SRCS += \
   PolicyS \
   ORB_Manager \
   ImplRepo_i \
+  PICurrent_Guard \
   ServerRequestInfo \
   ServerInterceptorAdapter \
   Default_Servant_Dispatcher \
@@ -109,6 +110,7 @@ endif
 .obj/PortableServer.o .obj/PortableServer.so .shobj/PortableServer.o .shobj/PortableServer.so: PortableServer.cpp PortableServer.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -393,6 +395,7 @@ endif
 .obj/PortableServerC.o .obj/PortableServerC.so .shobj/PortableServerC.o .shobj/PortableServerC.so: PortableServerC.cpp PortableServerC.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -586,30 +589,6 @@ endif
   $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
-  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
-  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
-  $(TAO_ROOT)/tao/Basic_Arguments.h \
-  $(TAO_ROOT)/tao/Basic_Argument_T.h \
-  $(TAO_ROOT)/tao/Basic_Argument_T.inl \
-  $(TAO_ROOT)/tao/Basic_Argument_T.cpp \
-  $(TAO_ROOT)/tao/Special_Basic_Arguments.h \
-  $(TAO_ROOT)/tao/Special_Basic_Argument_T.h \
-  $(TAO_ROOT)/tao/Special_Basic_Argument_T.inl \
-  $(TAO_ROOT)/tao/Special_Basic_Argument_T.cpp \
-  $(TAO_ROOT)/tao/UB_String_Arguments.h \
-  $(TAO_ROOT)/tao/UB_String_Argument_T.h \
-  $(TAO_ROOT)/tao/UB_String_Argument_T.inl \
-  $(TAO_ROOT)/tao/UB_String_Argument_T.cpp \
-  $(TAO_ROOT)/tao/Var_Size_Argument_T.h \
-  $(TAO_ROOT)/tao/Var_Size_Argument_T.inl \
-  $(TAO_ROOT)/tao/Var_Size_Argument_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -652,6 +631,30 @@ endif
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/TC_Constants_Forward.h \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Basic_Arguments.h \
+  $(TAO_ROOT)/tao/Basic_Argument_T.h \
+  $(TAO_ROOT)/tao/Basic_Argument_T.inl \
+  $(TAO_ROOT)/tao/Basic_Argument_T.cpp \
+  $(TAO_ROOT)/tao/Special_Basic_Arguments.h \
+  $(TAO_ROOT)/tao/Special_Basic_Argument_T.h \
+  $(TAO_ROOT)/tao/Special_Basic_Argument_T.inl \
+  $(TAO_ROOT)/tao/Special_Basic_Argument_T.cpp \
+  $(TAO_ROOT)/tao/UB_String_Arguments.h \
+  $(TAO_ROOT)/tao/UB_String_Argument_T.h \
+  $(TAO_ROOT)/tao/UB_String_Argument_T.inl \
+  $(TAO_ROOT)/tao/UB_String_Argument_T.cpp \
+  $(TAO_ROOT)/tao/Var_Size_Argument_T.h \
+  $(TAO_ROOT)/tao/Var_Size_Argument_T.inl \
+  $(TAO_ROOT)/tao/Var_Size_Argument_T.cpp \
   POA.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -772,6 +775,7 @@ endif
   $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -1258,6 +1262,7 @@ endif
   Default_Acceptor_Filter.h $(ACE_ROOT)/ace/pre.h \
   portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -1317,6 +1322,7 @@ endif
 .obj/Object_Adapter.o .obj/Object_Adapter.so .shobj/Object_Adapter.o .shobj/Object_Adapter.so: Object_Adapter.cpp Object_Adapter.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -1644,6 +1650,7 @@ endif
   $(TAO_ROOT)/tao/Tagged_Profile.i \
   $(TAO_ROOT)/tao/PICurrent.h \
   $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/PICurrent_Copy_Callback.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   ServerRequestInfo.inl Default_Servant_Dispatcher.h Servant_Dispatcher.h \
   ServerInterceptorAdapter.h \
@@ -1779,6 +1786,7 @@ endif
 .obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp Operation_Table.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -2056,6 +2064,7 @@ endif
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -2277,6 +2286,7 @@ endif
   $(ACE_ROOT)/ace/pre.h PortableServerC.h \
   portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -2671,6 +2681,7 @@ endif
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -2914,6 +2925,7 @@ endif
   $(ACE_ROOT)/ace/pre.h PortableServerC.h \
   portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -3350,6 +3362,7 @@ endif
   $(TAO_ROOT)/tao/Tagged_Profile.i \
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/PICurrent_Copy_Callback.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -3363,6 +3376,7 @@ endif
   $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -3766,6 +3780,7 @@ endif
   Direct_Object_Proxy_Impl.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -4053,6 +4068,7 @@ endif
   $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -4450,6 +4466,7 @@ endif
   $(TAO_ROOT)/tao/Sequence.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -4821,6 +4838,7 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/PICurrent_Copy_Callback.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Resource_Factory.h \
@@ -4894,6 +4912,7 @@ endif
   $(TAO_ROOT)/tao/Basic_Argument_T.cpp \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  PICurrent_Guard.h \
   ServerRequestInfo.h \
   ServerRequestInfo.inl \
   ServerInterceptorAdapter.h \
@@ -4907,6 +4926,7 @@ endif
   $(ACE_ROOT)/ace/pre.h PortableServer.h \
   portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -5093,6 +5113,7 @@ endif
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -5286,9 +5307,358 @@ endif
   Servant_Base.i \
   ImplRepoS.i
 
+.obj/PICurrent_Guard.o .obj/PICurrent_Guard.so .shobj/PICurrent_Guard.o .shobj/PICurrent_Guard.so: PICurrent_Guard.cpp PICurrent_Guard.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
+  $(ACE_ROOT)/ace/config.h \
+  $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_main.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/os_include/os_limits.h \
+  $(ACE_ROOT)/ace/os_include/os_unistd.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_types.h \
+  $(ACE_ROOT)/ace/os_include/os_stddef.h \
+  $(ACE_ROOT)/ace/os_include/os_inttypes.h \
+  $(ACE_ROOT)/ace/os_include/os_stdint.h \
+  $(ACE_ROOT)/ace/os_include/os_stdio.h \
+  $(ACE_ROOT)/ace/os_include/os_stdarg.h \
+  $(ACE_ROOT)/ace/os_include/os_float.h \
+  $(ACE_ROOT)/ace/os_include/os_stdlib.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_wait.h \
+  $(ACE_ROOT)/ace/os_include/os_signal.h \
+  $(ACE_ROOT)/ace/os_include/os_time.h \
+  $(ACE_ROOT)/ace/os_include/os_ucontext.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_resource.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_time.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/os_include/os_errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/Synch_Traits.h \
+  $(ACE_ROOT)/ace/Lock.h \
+  $(ACE_ROOT)/ace/Lock.inl \
+  portableserver_export.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(TAO_ROOT)/tao/Basic_Types.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/CORBA_methods.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/default_environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Thread_Mutex.h \
+  $(ACE_ROOT)/ace/OS_NS_Thread.h \
+  $(ACE_ROOT)/ace/os_include/os_pthread.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/os_include/sys/os_sem.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \
+  $(ACE_ROOT)/ace/os_include/os_semaphore.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_NS_stdlib.h \
+  $(ACE_ROOT)/ace/OS_NS_stdlib.inl \
+  $(ACE_ROOT)/ace/Object_Manager_Base.h \
+  $(ACE_ROOT)/ace/Cleanup.h \
+  $(ACE_ROOT)/ace/Cleanup.inl \
+  $(ACE_ROOT)/ace/Object_Manager_Base.inl \
+  $(ACE_ROOT)/ace/OS_NS_string.h \
+  $(ACE_ROOT)/ace/OS_NS_string.inl \
+  $(ACE_ROOT)/ace/OS_NS_wchar.h \
+  $(ACE_ROOT)/ace/os_include/os_wchar.h \
+  $(ACE_ROOT)/ace/os_include/os_string.h \
+  $(ACE_ROOT)/ace/os_include/os_ctype.h \
+  $(ACE_ROOT)/ace/OS_NS_wchar.inl \
+  $(ACE_ROOT)/ace/os_include/os_search.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_NS_signal.h \
+  $(ACE_ROOT)/ace/OS_NS_signal.inl \
+  $(ACE_ROOT)/ace/OS_NS_macros.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.inl \
+  $(ACE_ROOT)/ace/OS_NS_Thread.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/OS_NS_sys_time.h \
+  $(ACE_ROOT)/ace/OS_NS_sys_time.inl \
+  $(ACE_ROOT)/ace/OS_NS_sys_mman.h \
+  $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \
+  $(ACE_ROOT)/ace/OS_NS_fcntl.h \
+  $(ACE_ROOT)/ace/os_include/os_fcntl.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_stat.h \
+  $(ACE_ROOT)/ace/OS_NS_fcntl.inl \
+  $(ACE_ROOT)/ace/OS_NS_unistd.h \
+  $(ACE_ROOT)/ace/OS_NS_unistd.inl \
+  $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \
+  $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \
+  $(ACE_ROOT)/ace/OS_NS_stdio.h \
+  $(ACE_ROOT)/ace/OS_NS_stdio.inl \
+  $(ACE_ROOT)/ace/OS_NS_pwd.h \
+  $(ACE_ROOT)/ace/os_include/os_pwd.h \
+  $(ACE_ROOT)/ace/OS_NS_pwd.inl \
+  $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
+  $(ACE_ROOT)/ace/Thread_Mutex.inl \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Guard_T.h \
+  $(ACE_ROOT)/ace/Guard_T.inl \
+  $(ACE_ROOT)/ace/RW_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/RW_Mutex.h \
+  $(ACE_ROOT)/ace/RW_Mutex.inl \
+  $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \
+  $(ACE_ROOT)/ace/Guard_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/os_include/os_dlfcn.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_in.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_socket.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_uio.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/OS_NS_sys_socket.h \
+  $(ACE_ROOT)/ace/os_include/net/os_if.h \
+  $(ACE_ROOT)/ace/OS_NS_stropts.h \
+  $(ACE_ROOT)/ace/os_include/os_stropts.h \
+  $(ACE_ROOT)/ace/OS_NS_stropts.inl \
+  $(ACE_ROOT)/ace/OS_QoS.h \
+  $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \
+  $(ACE_ROOT)/ace/OS_NS_sys_uio.h \
+  $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Collocation_Strategy.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/ORB_Constants.h \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Null_Mutex.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/ORBInitializer_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Invocation_Utils.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_Argument_T.h \
+  $(TAO_ROOT)/tao/Argument.h \
+  $(TAO_ROOT)/tao/Object_Argument_T.inl \
+  $(TAO_ROOT)/tao/Object_Argument_T.cpp \
+  $(TAO_ROOT)/tao/Dynamic_ParameterC.h \
+  $(TAO_ROOT)/tao/ParameterMode.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Arg_Traits_T.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Dynamic_ParameterC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OBV_Constants.h \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/TC_Constants_Forward.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Condition_Thread_Mutex.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/TSS_T.h \
+  $(ACE_ROOT)/ace/TSS_T.inl \
+  $(ACE_ROOT)/ace/TSS_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.inl \
+  $(ACE_ROOT)/ace/Static_Object_Lock.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/TAO_Server_Request.h \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/PICurrent_Copy_Callback.h \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i
+
 .obj/ServerRequestInfo.o .obj/ServerRequestInfo.so .shobj/ServerRequestInfo.o .shobj/ServerRequestInfo.so: ServerRequestInfo.cpp ServerRequestInfo.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -5599,6 +5969,7 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/PICurrent_Copy_Callback.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   ServerRequestInfo.inl POA.h POAManager.h \
   $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
@@ -5686,6 +6057,7 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -5998,13 +6370,17 @@ endif
   $(TAO_ROOT)/tao/Tagged_Profile.i \
   $(TAO_ROOT)/tao/PICurrent.h \
   $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/PICurrent_Copy_Callback.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
-  ServerRequestInfo.inl
+  ServerRequestInfo.inl \
+  PICurrent_Guard.h \
+  portableserver_export.h
 
 .obj/Default_Servant_Dispatcher.o .obj/Default_Servant_Dispatcher.so .shobj/Default_Servant_Dispatcher.o .shobj/Default_Servant_Dispatcher.so: Default_Servant_Dispatcher.cpp \
   Default_Servant_Dispatcher.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -6330,6 +6706,7 @@ endif
   $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -6612,6 +6989,7 @@ endif
   $(ACE_ROOT)/ace/pre.h POA_Policies.h \
   PortableServerC.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -6785,6 +7163,7 @@ endif
   $(ACE_ROOT)/ace/pre.h PortableServerC.h \
   portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -6956,6 +7335,7 @@ endif
   PortableServer_ORBInitializer.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -7331,6 +7711,7 @@ endif
   PortableServer_PolicyFactory.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -7564,6 +7945,7 @@ endif
   $(ACE_ROOT)/ace/pre.h POA_Policies.h \
   PortableServerC.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -7906,6 +8288,7 @@ endif
   Default_Policy_Validator.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -8084,6 +8467,7 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -8429,6 +8813,7 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -8707,6 +9092,7 @@ endif
   ObjectReferenceTemplate.h $(ACE_ROOT)/ace/pre.h \
   portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -9035,6 +9421,7 @@ endif
   portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
   $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -9287,6 +9674,7 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/PICurrent_Copy_Callback.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   $(TAO_ROOT)/tao/Transport.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
@@ -9402,6 +9790,7 @@ endif
   $(ACE_ROOT)/ace/pre.h PortableServerC.h \
   portableserver_export.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -9728,6 +10117,7 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -9986,6 +10376,7 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -10361,6 +10752,7 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/PICurrent_Copy_Callback.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Resource_Factory.h \
@@ -10441,6 +10833,7 @@ endif
   $(TAO_ROOT)/tao/Var_Size_Argument_T.cpp \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  PICurrent_Guard.h \
   ServerRequestInfo.h \
   ServerRequestInfo.inl \
   ServerInterceptorAdapter.h \
@@ -10457,6 +10850,7 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -10722,6 +11116,7 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config-lite.h \
   $(ACE_ROOT)/ace/config.h \
   $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
@@ -11097,6 +11492,7 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/PICurrent_Copy_Callback.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Resource_Factory.h \
@@ -11181,6 +11577,7 @@ endif
   $(TAO_ROOT)/tao/Var_Size_Argument_T.cpp \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  PICurrent_Guard.h \
   ServerRequestInfo.h \
   ServerRequestInfo.inl \
   ServerInterceptorAdapter.h \
diff --git a/TAO/tao/PortableServer/Makefile.bor b/TAO/tao/PortableServer/Makefile.bor
index d0b8eb18a02..5cccd912126 100644
--- a/TAO/tao/PortableServer/Makefile.bor
+++ b/TAO/tao/PortableServer/Makefile.bor
@@ -25,6 +25,7 @@ OBJFILES = \
 	$(OBJDIR)\Operation_Table.obj \
 	$(OBJDIR)\ORB_Manager.obj \
 	$(OBJDIR)\ImplRepo_i.obj \
+	$(OBJDIR)\PICurrent_Guard.obj \
 	$(OBJDIR)\POA.obj \
 	$(OBJDIR)\POAManager.obj \
 	$(OBJDIR)\POA_Cached_Policies.obj \
diff --git a/TAO/tao/PortableServer/PICurrent_Guard.cpp b/TAO/tao/PortableServer/PICurrent_Guard.cpp
new file mode 100644
index 00000000000..c583311b8be
--- /dev/null
+++ b/TAO/tao/PortableServer/PICurrent_Guard.cpp
@@ -0,0 +1,80 @@
+#include "PICurrent_Guard.h"
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+
+ACE_RCSID (PortableServer,
+           PICurrent_Guard,
+           "$Id$")
+
+
+#include "tao/ORB_Core.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/PICurrent_Copy_Callback.h"
+
+
+TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request,
+                                       bool tsc_to_rsc)
+  : src_ (0),
+    dest_ (0),
+    copy_callback_ (server_request.pi_current_copy_callback ()),
+    tsc_to_rsc_ (tsc_to_rsc)
+{
+  // This constructor is used on the server side.
+
+  // Retrieve the thread scope current (no TSS access incurred yet).
+  PICurrent * pi_current = server_request.orb_core ()->pi_current ();
+
+  // If the slot count is zero, there is nothing to copy.  Prevent any
+  // copying (and hence TSS accesses) from occurring.
+  if (pi_current != 0 && pi_current->slot_count () != 0)
+    {
+      // Retrieve the request scope current.
+      PICurrent_Impl * rsc = &server_request.rs_pi_current ();
+
+      // Retrieve the thread scope current.
+      PICurrent_Impl * tsc = pi_current->tsc ();
+
+      if (tsc_to_rsc)
+        {
+          // TSC to RSC copy.
+          // Occurs after receive_request() interception point and
+          // upcall.
+          this->src_  = tsc;
+          this->dest_ = rsc;
+        }
+      else
+        {
+          // RSC to TSC copy.
+          // Occurs after receive_request_service_contexts()
+          // interception point.
+          this->src_  = rsc;
+          this->dest_ = tsc;
+        }
+    }
+}
+
+TAO::PICurrent_Guard::~PICurrent_Guard (void)
+{
+  if (this->src_ != 0 && this->dest_ != 0
+      & this->src_ != this->dest_)
+    {
+      // This copy better be exception-safe!
+      this->dest_->lc_slot_table (this->src_);
+
+      // PICurrent will potentially have to call back on the request
+      // scope current so that it can deep copy the contents of the
+      // thread scope current if the contents of the thread scope
+      // current are about to be modified.  It is necessary to do this
+      // deep copy once in order to completely isolate the request
+      // scope current from the thread scope current.  This is only
+      // necessary, if the thread scope current is modified after its
+      // contents have been *logically* copied to the request scope
+      // current.  The same goes for the reverse, i.e. RSC to TSC.
+      this->copy_callback_.src_and_dst (this->src_, this->dest_);
+      this->src_->copy_callback (&this->copy_callback_);
+    }
+}
+
+
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PortableServer/PICurrent_Guard.h b/TAO/tao/PortableServer/PICurrent_Guard.h
new file mode 100644
index 00000000000..667cb45e1ef
--- /dev/null
+++ b/TAO/tao/PortableServer/PICurrent_Guard.h
@@ -0,0 +1,107 @@
+// -*- C++ -*-
+
+// ===================================================================
+/**
+ *  @file   PICurrent_Guard.h
+ *
+ *  $Id$
+ *
+ *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
+ */
+// ===================================================================
+
+#ifndef TAO_PI_CURRENT_GUARD_H
+#define TAO_PI_CURRENT_GUARD_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+#include "portableserver_export.h"
+
+/// Forward declarations.
+class TAO_ServerRequest;
+
+namespace TAO
+{
+  class PICurrent_Impl;
+  class PICurrent_Copy_Callback;
+
+  /**
+   * @class PICurrent_Guard
+   *
+   * @brief Class used to make copying between request scope current
+   *        and thread scope current exception-safe.
+   *
+   * Since copies between the request scope current and thread scope
+   * current must also occur if an exception is thrown, e.g. made
+   * available to the send_exception() interception points, the
+   * "guard" idiom is used to make this action exception-safe.
+   *
+   * @note This Guard class is only used on the server side.
+   */
+  class TAO_PortableServer_Export PICurrent_Guard
+  {
+  public:
+
+    /// Constructor
+    /**
+     * This constructor sets up this guard to copy the data held in a
+     * given PICurrent when transitioning from that PICurrent's scope
+     * to another scope (e.g. request scope to thread scope transition
+     * immediately following receive_request_service_contexts() on
+     * server side).
+     *
+     * @param tsc_to_rsc true when copying TSC slot table to RSC slot
+     *                        table, i.e. after target operation
+     *                        completes.
+     */
+    PICurrent_Guard (TAO_ServerRequest &server_request,
+                     bool tsc_to_rsc);
+
+    /// Destructor
+    /**
+     * The destructor copies (a logical copy whenever possible) data
+     * held in a given PICurrent when transitioning from one PICurrent
+     * scope to another immediately before any ending interception
+     * points are invoked, and after the starting and intermediate (if
+     * any) interception points are invoked.
+     */
+    ~PICurrent_Guard (void);
+
+  private:
+
+    /// The PICurrent implementation whose slot table will be copied.
+    PICurrent_Impl * src_;
+
+    /// The PICurrent implementation whose slot table will be filled
+    /// with the contents of another PICurrent's slot table.
+    PICurrent_Impl * dest_;
+
+    /// Callback object responsible for performing deep copies of a
+    /// PICurrent's slot table.
+    PICurrent_Copy_Callback & copy_callback_;
+
+    /// Flag that indicates if the TSC is to be copied to the RSC.
+    /**
+     * If false, then the RSC must be deep copied upon leaving the
+     * request scope and entering the thread scope.  This is necessary
+     * since the RSC slot table is no longer available upon leaving
+     * the thread scope, meaning that a logical copy is not enough.
+     */
+    const bool tsc_to_rsc_;
+
+  };
+}
+
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_PI_CURRENT_GUARD_H */
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index ff0bb250129..14833c36e36 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -49,7 +49,7 @@
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
-#include "tao/PICurrent.h"
+#include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -994,8 +994,8 @@ void POA_CORBA::Policy::_get_policy_type_skel (
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            1  /* Copy TSC to RSC */);
 
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
@@ -1125,8 +1125,8 @@ void POA_CORBA::Policy::copy_skel (
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            1  /* Copy TSC to RSC */);
 
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
@@ -1258,8 +1258,8 @@ void POA_CORBA::Policy::destroy_skel (
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            1  /* Copy TSC to RSC */);
 
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc
index df5550e4676..0e700cc9e86 100644
--- a/TAO/tao/PortableServer/PortableServer.mpc
+++ b/TAO/tao/PortableServer/PortableServer.mpc
@@ -22,6 +22,7 @@ project : taolib, core, objreftemplate, iorinterceptor {
     ObjectReferenceTemplate.cpp
     Operation_Table.cpp
     ORB_Manager.cpp
+    PICurrent_Guard.cpp
     POA.cpp
     POA_Cached_Policies.cpp
     POA_Policies.cpp