From e0813db25e4e1b4c3ae31cdd4d5da070ed8f134f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 10 Mar 2005 20:04:53 +0000 Subject: ChangeLogTag: Thu Mar 10 19:58:12 UTC 2005 Johnny Willemsen --- TAO/ChangeLog | 8 +++++ TAO/tao/PortableServer/PolicyS.cpp | 57 ++++++++++-------------------------- TAO/tao/PortableServer/PolicyS.h | 4 +-- TAO/tao/PortableServer/PolicyS_T.cpp | 2 +- TAO/tao/PortableServer/PolicyS_T.h | 4 +-- 5 files changed, 28 insertions(+), 47 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3f3a30bd8f1..f78f5cc8487 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Mar 10 20:02:12 UTC 2005 Johnny Willemsen + + * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp: + * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp: + * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp: + * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp: + Regenerated + Thu Mar 10 19:58:12 UTC 2005 Johnny Willemsen * tao/ImR_Client/ServerObject{C,A,S}.{h,cpp,inl}: diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 7d9ccb9a53a..5b1cd1afa25 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -27,7 +27,7 @@ // TAO_IDL - Generated from -// be\be_codegen.cpp:609 +// be\be_codegen.cpp:617 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_ #define _TAO_IDL_ORIG_POLICYS_CPP_ @@ -35,7 +35,7 @@ #include "PolicyS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" -#include "tao/PortableServer/ForwardRequestC.h" +#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" #include "tao/PortableServer/Basic_SArguments.h" @@ -123,7 +123,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_interface.cpp:1535 +// be\be_interface.cpp:1455 class TAO_CORBA_Policy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable @@ -288,43 +288,16 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Abstract_ServantBase * const servant = obj->_servant (); - - TAO_Collocated_Skeleton collocated_skel; - int const status = servant->_find (op, - collocated_skel, - strategy, - op_len); - - if (status == -1) - { - ACE_THROW (CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); - } - - ACE_TRY - { - collocated_skel (servant, - args, - num_args - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } -#if (TAO_HAS_MINIMUM_CORBA == 0) - ACE_CATCH (PortableServer::ForwardRequest, forward_request) - { - forward_obj = - CORBA::Object::_duplicate (forward_request.forward_reference.in ()); - return; - } -#else - ACE_CATCHANY - { - ACE_UNUSED_ARG (forward_obj); - ACE_RE_THROW; - } -#endif /* TAO_HAS_MINIMUM_CORBA */ - ACE_ENDTRY; - ACE_CHECK; + TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper; + collocation_upcall_wrapper.upcall ( + obj, + forward_obj, + args, + num_args, + op, + op_len, + strategy + ACE_ENV_ARG_PARAMETER); } // @@ -332,7 +305,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:978 +// be\be_visitor_interface/interface_ss.cpp:985 TAO::Collocation_Proxy_Broker * CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -1121,7 +1094,7 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1575 +// be\be_visitor_root/root.cpp:1582 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index 0f83fd97bfb..5bb799161be 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:390 +// be\be_codegen.cpp:398 #ifndef _TAO_IDL_ORIG_POLICYS_H_ #define _TAO_IDL_ORIG_POLICYS_H_ @@ -310,7 +310,7 @@ namespace POA_CORBA } // module CORBA // TAO_IDL - Generated from -// be\be_codegen.cpp:997 +// be\be_codegen.cpp:1005 #include "PolicyS_T.h" diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp index 01dfaa34975..555d0ae2e61 100644 --- a/TAO/tao/PortableServer/PolicyS_T.cpp +++ b/TAO/tao/PortableServer/PolicyS_T.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:683 +// be\be_codegen.cpp:691 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_ #define _TAO_IDL_ORIG_POLICYS_T_CPP_ diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index 07d9445660a..13a6feb65b2 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:546 +// be\be_codegen.cpp:554 #ifndef _TAO_IDL_ORIG_POLICYS_T_H_ #define _TAO_IDL_ORIG_POLICYS_T_H_ @@ -127,7 +127,7 @@ namespace POA_CORBA } // module CORBA // TAO_IDL - Generated from -// be\be_codegen.cpp:1094 +// be\be_codegen.cpp:1102 #if defined (__ACE_INLINE__) #include "PolicyS_T.inl" -- cgit v1.2.1