diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-03 21:41:40 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-03 21:41:40 +0000 |
| commit | 261e617c9f3cf9970ee006642024d293b1b7bc8a (patch) | |
| tree | 4d6d99048cfab945d51980ae03fd14714a731fbb | |
| parent | 543c395c6d3778696bf5382a9a4aafec0121aa30 (diff) | |
| download | ATCD-261e617c9f3cf9970ee006642024d293b1b7bc8a.tar.gz | |
Added the ability to create dynamic threads on demand.
| -rw-r--r-- | TAO/docs/rtcorba/status.html | 46 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp | 2195 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp | 5725 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp | 3232 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp | 2104 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp | 22 | ||||
| -rw-r--r-- | TAO/tao/Domain/DomainS.cpp | 16 | ||||
| -rw-r--r-- | TAO/tao/IORManipulation/IORManipulation.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Leader_Follower.h | 12 | ||||
| -rw-r--r-- | TAO/tao/Leader_Follower.i | 17 | ||||
| -rw-r--r-- | TAO/tao/New_Leader_Generator.h | 40 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Default_Acceptor_Filter.h | 2 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/Thread_Pool.cpp | 98 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/Thread_Pool.h | 47 | ||||
| -rw-r--r-- | TAO/tao/Thread_Lane_Resources.cpp | 9 | ||||
| -rw-r--r-- | TAO/tao/Thread_Lane_Resources.h | 7 | ||||
| -rw-r--r-- | TAO/threadpool-changes | 88 |
17 files changed, 6998 insertions, 6664 deletions
diff --git a/TAO/docs/rtcorba/status.html b/TAO/docs/rtcorba/status.html index d908a847a23..ef3518b7a36 100644 --- a/TAO/docs/rtcorba/status.html +++ b/TAO/docs/rtcorba/status.html @@ -107,18 +107,42 @@ for their implementation: <h3><a name="future">Future Work</a></h3> <ol> - <li>Improve current RT CORBA implementation through benchmarking and optimizations, - resolving known bugs and issues, adding examples, and other enhancements.</li> - <li>Implement an alternative real-time orb architecture using a <em>queue-per-lane</em> - approach, as described in the <a href="architecture.html">TAO Real-Time Architecture</a> - section. In this approach, each threadpool lane owns a queue, while I/O resources - are being shared among all the threadpool lanes of the same priority within a server. - Strategize TAO to use either <em>queue-per-lane</em> or <em>reactor-per-lane</em> + + <li>Currently, persistent objects are not supported for RT POAs. We + need to add this feature.</li> + + <li>Currently, purging of connection only happens for the lane of + the thread that runs out of connection. We need to change this + such that we allow system wide purging.</li> + + <li>Currently, all user-created threads are part of the default + thread pool. There is nothing done to separate out these threads + into different (implicit) lanes based on their priorities. We may + need to add this separation to get better/predictable behavior + with respect to sharing of resources across threads of different + priorities.</li> + + <li>Currently, some CDR memory pools are global. We should + reevaluate them to see which of them can be made a per-lane + resource.</li> + + <li>Improve current RT CORBA implementation through benchmarking and + optimizations, resolving known bugs and issues, adding examples, + and other enhancements.</li> + + <li>Implement an alternative real-time orb architecture using a + <em>queue-per-lane</em> approach, as described in the <a + href="architecture.html">TAO Real-Time Architecture</a> + section. In this approach, each threadpool lane owns a queue, + while I/O resources are being shared among all the threadpool + lanes of the same priority within a server. Strategize TAO to use + either <em>queue-per-lane</em> or <em>reactor-per-lane</em> implementation, and compare the two.</li> - <li>As both real-time and fault tolerance implementations mature separately, explore issues - in combining them, and, ultimately, enable TAO to provide applications with both real-time - and fault tolerance support at the same time. </li> -</ol> + + <li>As both real-time and fault tolerance implementations mature + separately, explore issues in combining them, and, ultimately, + enable TAO to provide applications with both real-time and fault + tolerance support at the same time. </li> </ol> <hr> <i> diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp index 2193a95c80a..987ad2b0cdf 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp @@ -128,11 +128,11 @@ TAO_CORBA_IRObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA_IRObject::_is_a_skel}, {"",0}, - {"destroy", &POA_CORBA_IRObject::destroy_skel}, + {"destroy", &POA_CORBA_IRObject::destroy_skel}, {"",0},{"",0}, {"_interface", &POA_CORBA_IRObject::_interface_skel}, {"",0},{"",0}, - {"_get_def_kind", &POA_CORBA_IRObject::_get_def_kind_skel}, + {"_get_def_kind", &POA_CORBA_IRObject::_get_def_kind_skel}, {"",0},{"",0},{"",0},{"",0}, {"_non_existent", &POA_CORBA_IRObject::_non_existent_skel}, }; @@ -162,7 +162,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -171,23 +171,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -198,7 +198,7 @@ public: private: TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &); void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &); - + private: POA_CORBA_IRObject *_tao_impl; CORBA::DefinitionKind _result; @@ -222,7 +222,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -234,11 +234,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -247,11 +247,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -273,7 +273,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::DefinitionKind result) { // Update the result. @@ -287,7 +287,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -296,36 +296,36 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_IRObject_destroy (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &); void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &); - + private: POA_CORBA_IRObject *_tao_impl; - + }; TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy ( @@ -346,7 +346,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -358,11 +358,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &AC Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -371,7 +371,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -410,14 +410,14 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::_TAO_CORBA_IRObject_Strategized_Pr { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_IRObject_Strategized_Proxy_Broker::~_TAO_CORBA_IRObject_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_IRObject_Proxy_Impl& @@ -427,26 +427,27 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_IRObject_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -459,7 +460,7 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -469,9 +470,9 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -491,13 +492,13 @@ _TAO_CORBA_IRObject_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_IRObject_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_IRObject_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_IRObject_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_IRObject_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_IRObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_IRObject_Proxy_Broker_Factory_Initializer)); @@ -600,37 +601,37 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( { POA_CORBA_IRObject *_tao_impl = ACE_static_cast (POA_CORBA_IRObject *, _tao_object_reference); - + CORBA::DefinitionKind _tao_retval; #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_CORBA_IRObject_def_kind_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->def_kind ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::DefinitionKind _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -646,11 +647,11 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -658,11 +659,11 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( 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) )) @@ -670,7 +671,7 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -684,37 +685,37 @@ void POA_CORBA_IRObject::destroy_skel ( { POA_CORBA_IRObject *_tao_impl = ACE_static_cast (POA_CORBA_IRObject *, _tao_object_reference); - + _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_CORBA_IRObject_destroy ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->destroy ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -728,11 +729,11 @@ void POA_CORBA_IRObject::destroy_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -740,18 +741,18 @@ void POA_CORBA_IRObject::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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_IRObject::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -763,10 +764,10 @@ void POA_CORBA_IRObject::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -774,7 +775,7 @@ void POA_CORBA_IRObject::_is_a_skel ( } void POA_CORBA_IRObject::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -783,7 +784,7 @@ void POA_CORBA_IRObject::_non_existent_skel ( POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -791,7 +792,7 @@ void POA_CORBA_IRObject::_non_existent_skel ( } void POA_CORBA_IRObject::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -800,26 +801,26 @@ void POA_CORBA_IRObject::_interface_skel ( POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -831,7 +832,7 @@ void POA_CORBA_IRObject::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -845,7 +846,7 @@ CORBA::Boolean POA_CORBA_IRObject::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) @@ -884,20 +885,20 @@ POA_CORBA_IRObject::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_IRObject::_unchecked_narrow (obj.in ()); } @@ -980,29 +981,29 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_Contained::move_skel}, + {"move", &POA_CORBA_Contained::move_skel}, {"_is_a", &POA_CORBA_Contained::_is_a_skel}, - {"_get_id", &POA_CORBA_Contained::_get_id_skel}, - {"_set_id", &POA_CORBA_Contained::_set_id_skel}, - {"describe", &POA_CORBA_Contained::describe_skel}, - {"_get_name", &POA_CORBA_Contained::_get_name_skel}, - {"_set_name", &POA_CORBA_Contained::_set_name_skel}, + {"_get_id", &POA_CORBA_Contained::_get_id_skel}, + {"_set_id", &POA_CORBA_Contained::_set_id_skel}, + {"describe", &POA_CORBA_Contained::describe_skel}, + {"_get_name", &POA_CORBA_Contained::_get_name_skel}, + {"_set_name", &POA_CORBA_Contained::_set_name_skel}, {"_interface", &POA_CORBA_Contained::_interface_skel}, - {"_get_version", &POA_CORBA_Contained::_get_version_skel}, - {"_set_version", &POA_CORBA_Contained::_set_version_skel}, - {"_get_def_kind", &POA_CORBA_Contained::_get_def_kind_skel}, - {"_get_defined_in", &POA_CORBA_Contained::_get_defined_in_skel}, - {"destroy", &POA_CORBA_Contained::destroy_skel}, - {"_get_absolute_name", &POA_CORBA_Contained::_get_absolute_name_skel}, + {"_get_version", &POA_CORBA_Contained::_get_version_skel}, + {"_set_version", &POA_CORBA_Contained::_set_version_skel}, + {"_get_def_kind", &POA_CORBA_Contained::_get_def_kind_skel}, + {"_get_defined_in", &POA_CORBA_Contained::_get_defined_in_skel}, + {"destroy", &POA_CORBA_Contained::destroy_skel}, + {"_get_absolute_name", &POA_CORBA_Contained::_get_absolute_name_skel}, {"_non_existent", &POA_CORBA_Contained::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_Contained::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_CORBA_Contained::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -2, -12, -2, 4, 5, -1, 48, 8, -45, 11, -1, -46, 14, - -1, 15, -1, 16, 17, -6, -2, -1, -1, 18, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 19, + -9, -2, -12, -2, 4, 5, -1, 48, 8, -45, 11, -1, -46, 14, + -1, 15, -1, 16, 17, -6, -2, -1, -1, 18, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 19, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -1047,7 +1048,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1056,23 +1057,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -1083,7 +1084,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Contained_id_get (const TAO_ServerRequestInfo_CORBA_Contained_id_get &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_id_get &); - + private: POA_CORBA_Contained *_tao_impl; char * _result; @@ -1107,7 +1108,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (CORBA::Environment &ACE Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -1119,11 +1120,11 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (CORBA::Environment &AC Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1132,11 +1133,11 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::result (CORBA::Environment &ACE_TR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1158,7 +1159,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Contained_id_get::result (char * result) { // Update the result. @@ -1173,7 +1174,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , const char * id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1182,37 +1183,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_Contained_id_set (const TAO_ServerRequestInfo_CORBA_Contained_id_set &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_id_set &); - + private: POA_CORBA_Contained *_tao_impl; const char * id_; - + }; TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contained_id_set ( @@ -1235,16 +1236,16 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (CORBA::Environment &ACE Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1256,11 +1257,11 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (CORBA::Environment &AC Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1269,7 +1270,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::result (CORBA::Environment &ACE_TR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -1298,7 +1299,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1307,23 +1308,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -1334,7 +1335,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Contained_name_get (const TAO_ServerRequestInfo_CORBA_Contained_name_get &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_name_get &); - + private: POA_CORBA_Contained *_tao_impl; char * _result; @@ -1358,7 +1359,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (CORBA::Environment &A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -1370,11 +1371,11 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (CORBA::Environment & Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1383,11 +1384,11 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::result (CORBA::Environment &ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1409,7 +1410,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Contained_name_get::result (char * result) { // Update the result. @@ -1424,7 +1425,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , const char * name, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1433,37 +1434,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_Contained_name_set (const TAO_ServerRequestInfo_CORBA_Contained_name_set &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_name_set &); - + private: POA_CORBA_Contained *_tao_impl; const char * name_; - + }; TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Contained_name_set ( @@ -1486,16 +1487,16 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (CORBA::Environment &A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= name_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1507,11 +1508,11 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (CORBA::Environment & Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1520,7 +1521,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::result (CORBA::Environment &ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -1549,7 +1550,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1558,23 +1559,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -1585,7 +1586,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Contained_version_get (const TAO_ServerRequestInfo_CORBA_Contained_version_get &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_version_get &); - + private: POA_CORBA_Contained *_tao_impl; char * _result; @@ -1609,7 +1610,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -1621,11 +1622,11 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1634,11 +1635,11 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1660,7 +1661,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Contained_version_get::result (char * result) { // Update the result. @@ -1675,7 +1676,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , const char * version, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1684,37 +1685,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_Contained_version_set (const TAO_ServerRequestInfo_CORBA_Contained_version_set &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_version_set &); - + private: POA_CORBA_Contained *_tao_impl; const char * version_; - + }; TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_Contained_version_set ( @@ -1737,16 +1738,16 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= version_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1758,11 +1759,11 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1771,7 +1772,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -1800,7 +1801,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1809,23 +1810,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -1836,7 +1837,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (const TAO_ServerRequestInfo_CORBA_Contained_defined_in_get &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_defined_in_get &); - + private: POA_CORBA_Contained *_tao_impl; CORBA_Container_ptr _result; @@ -1860,7 +1861,7 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (CORBA::Environm Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -1872,11 +1873,11 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (CORBA::Environ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1885,11 +1886,11 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1911,7 +1912,7 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (CORBA_Container_ptr result) { // Update the result. @@ -1925,7 +1926,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1934,23 +1935,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -1961,7 +1962,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get (const TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get &); - + private: POA_CORBA_Contained *_tao_impl; char * _result; @@ -1985,7 +1986,7 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -1997,11 +1998,11 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2010,11 +2011,11 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2036,7 +2037,7 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (char * result) { // Update the result. @@ -2050,7 +2051,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2059,23 +2060,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -2086,7 +2087,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (const TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get &); - + private: POA_CORBA_Contained *_tao_impl; CORBA_Repository_ptr _result; @@ -2110,7 +2111,7 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2122,11 +2123,11 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2135,11 +2136,11 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2161,7 +2162,7 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA_Repository_ptr result) { // Update the result. @@ -2175,7 +2176,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2184,23 +2185,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -2211,7 +2212,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Contained_describe (const TAO_ServerRequestInfo_CORBA_Contained_describe &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_describe &); - + private: POA_CORBA_Contained *_tao_impl; CORBA_Contained::Description * _result; @@ -2235,7 +2236,7 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (CORBA::Environment &A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2247,11 +2248,11 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (CORBA::Environment & Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2260,11 +2261,11 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::result (CORBA::Environment &ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2286,7 +2287,7 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Contained_describe::result (CORBA_Contained::Description * result) { // Update the result. @@ -2303,7 +2304,7 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2312,39 +2313,39 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_Contained_move (const TAO_ServerRequestInfo_CORBA_Contained_move &); void operator= (const TAO_ServerRequestInfo_CORBA_Contained_move &); - + private: POA_CORBA_Contained *_tao_impl; CORBA_Container_ptr new_container_; const char * new_name_; const char * new_version_; - + }; TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Contained_move ( @@ -2371,12 +2372,12 @@ TAO_ServerRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_T Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (3); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->new_container_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -2386,7 +2387,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_T (*parameter_list)[len].argument <<= new_version_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2398,11 +2399,11 @@ TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (CORBA::Environment &ACE_ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Contained_move::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2411,7 +2412,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::result (CORBA::Environment &ACE_TRY_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2450,14 +2451,14 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::_TAO_CORBA_Contained_Strategized_ { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_Contained_Strategized_Proxy_Broker::~_TAO_CORBA_Contained_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_Contained_Proxy_Impl& @@ -2467,26 +2468,27 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_Contained_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -2499,7 +2501,7 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -2509,9 +2511,9 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -2531,13 +2533,13 @@ _TAO_CORBA_Contained_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_Contained_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_Contained_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_Contained_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_Contained_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_Contained_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_Contained_Proxy_Broker_Factory_Initializer)); @@ -2929,37 +2931,37 @@ void POA_CORBA_Contained::_get_id_skel ( { POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + CORBA::String_var _tao_retval; #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_CORBA_Contained_id_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->id ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) char * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2976,11 +2978,11 @@ void POA_CORBA_Contained::_get_id_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2988,11 +2990,11 @@ void POA_CORBA_Contained::_get_id_skel ( 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 ()) )) @@ -3000,7 +3002,7 @@ void POA_CORBA_Contained::_get_id_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3015,7 +3017,7 @@ void POA_CORBA_Contained::_set_id_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::String_var id; if (!( @@ -3027,12 +3029,12 @@ void POA_CORBA_Contained::_set_id_skel ( #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_CORBA_Contained_id_set ri ( _tao_server_request, _tao_upcall, @@ -3040,20 +3042,20 @@ void POA_CORBA_Contained::_set_id_skel ( id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->id ( id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -3067,11 +3069,11 @@ void POA_CORBA_Contained::_set_id_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3079,12 +3081,12 @@ void POA_CORBA_Contained::_set_id_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3098,37 +3100,37 @@ void POA_CORBA_Contained::_get_name_skel ( { POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + CORBA::String_var _tao_retval; #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_CORBA_Contained_name_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->name ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) char * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -3145,11 +3147,11 @@ void POA_CORBA_Contained::_get_name_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3157,11 +3159,11 @@ void POA_CORBA_Contained::_get_name_skel ( 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 ()) )) @@ -3169,7 +3171,7 @@ void POA_CORBA_Contained::_get_name_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3184,7 +3186,7 @@ void POA_CORBA_Contained::_set_name_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::String_var name; if (!( @@ -3196,12 +3198,12 @@ void POA_CORBA_Contained::_set_name_skel ( #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_CORBA_Contained_name_set ri ( _tao_server_request, _tao_upcall, @@ -3209,20 +3211,20 @@ void POA_CORBA_Contained::_set_name_skel ( name.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->name ( name.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -3236,11 +3238,11 @@ void POA_CORBA_Contained::_set_name_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3248,12 +3250,12 @@ void POA_CORBA_Contained::_set_name_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3267,37 +3269,37 @@ void POA_CORBA_Contained::_get_version_skel ( { POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + CORBA::String_var _tao_retval; #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_CORBA_Contained_version_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->version ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) char * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -3314,11 +3316,11 @@ void POA_CORBA_Contained::_get_version_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3326,11 +3328,11 @@ void POA_CORBA_Contained::_get_version_skel ( 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 ()) )) @@ -3338,7 +3340,7 @@ void POA_CORBA_Contained::_get_version_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3353,7 +3355,7 @@ void POA_CORBA_Contained::_set_version_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::String_var version; if (!( @@ -3365,12 +3367,12 @@ void POA_CORBA_Contained::_set_version_skel ( #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_CORBA_Contained_version_set ri ( _tao_server_request, _tao_upcall, @@ -3378,20 +3380,20 @@ void POA_CORBA_Contained::_set_version_skel ( version.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->version ( version.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -3405,11 +3407,11 @@ void POA_CORBA_Contained::_set_version_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3417,12 +3419,12 @@ void POA_CORBA_Contained::_set_version_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3436,37 +3438,37 @@ void POA_CORBA_Contained::_get_defined_in_skel ( { POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + CORBA_Container_var _tao_retval; #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_CORBA_Contained_defined_in_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->defined_in ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_Container_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -3483,11 +3485,11 @@ void POA_CORBA_Contained::_get_defined_in_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3495,11 +3497,11 @@ void POA_CORBA_Contained::_get_defined_in_skel ( 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 ()) )) @@ -3507,7 +3509,7 @@ void POA_CORBA_Contained::_get_defined_in_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3521,37 +3523,37 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( { POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + CORBA::String_var _tao_retval; #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_CORBA_Contained_absolute_name_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->absolute_name ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) char * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -3568,11 +3570,11 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3580,11 +3582,11 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( 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 ()) )) @@ -3592,7 +3594,7 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3606,37 +3608,37 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( { POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + CORBA_Repository_var _tao_retval; #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_CORBA_Contained_containing_repository_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->containing_repository ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_Repository_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -3653,11 +3655,11 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3665,11 +3667,11 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( 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 ()) )) @@ -3677,7 +3679,7 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3691,37 +3693,37 @@ void POA_CORBA_Contained::describe_skel ( { POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + CORBA_Contained::Description_var _tao_retval; #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_CORBA_Contained_describe ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->describe ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_Contained::Description * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -3738,11 +3740,11 @@ void POA_CORBA_Contained::describe_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3750,11 +3752,11 @@ void POA_CORBA_Contained::describe_skel ( 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 ()) )) @@ -3762,7 +3764,7 @@ void POA_CORBA_Contained::describe_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3777,7 +3779,7 @@ void POA_CORBA_Contained::move_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Contained *_tao_impl = ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_Container_var new_container; CORBA::String_var new_name; @@ -3793,12 +3795,12 @@ void POA_CORBA_Contained::move_skel ( #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_CORBA_Contained_move ri ( _tao_server_request, _tao_upcall, @@ -3808,14 +3810,14 @@ void POA_CORBA_Contained::move_skel ( new_version.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->move ( new_container.in (), new_name.in (), @@ -3823,7 +3825,7 @@ void POA_CORBA_Contained::move_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -3837,11 +3839,11 @@ void POA_CORBA_Contained::move_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3849,18 +3851,18 @@ void POA_CORBA_Contained::move_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_Contained::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -3872,10 +3874,10 @@ void POA_CORBA_Contained::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -3883,7 +3885,7 @@ void POA_CORBA_Contained::_is_a_skel ( } void POA_CORBA_Contained::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -3892,7 +3894,7 @@ void POA_CORBA_Contained::_non_existent_skel ( POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -3900,7 +3902,7 @@ void POA_CORBA_Contained::_non_existent_skel ( } void POA_CORBA_Contained::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -3909,26 +3911,26 @@ void POA_CORBA_Contained::_interface_skel ( POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -3940,7 +3942,7 @@ void POA_CORBA_Contained::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -3954,7 +3956,7 @@ CORBA::Boolean POA_CORBA_Contained::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || @@ -3996,20 +3998,20 @@ POA_CORBA_Contained::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_Contained::_unchecked_narrow (obj.in ()); } @@ -4092,35 +4094,35 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0},{"",0},{"",0}, - {"lookup", &POA_CORBA_Container::lookup_skel}, - {"destroy", &POA_CORBA_Container::destroy_skel}, - {"lookup_name", &POA_CORBA_Container::lookup_name_skel}, - {"create_value", &POA_CORBA_Container::create_value_skel}, - {"create_module", &POA_CORBA_Container::create_module_skel}, - {"create_native", &POA_CORBA_Container::create_native_skel}, - {"create_interface", &POA_CORBA_Container::create_interface_skel}, - {"create_union", &POA_CORBA_Container::create_union_skel}, - {"create_struct", &POA_CORBA_Container::create_struct_skel}, - {"create_constant", &POA_CORBA_Container::create_constant_skel}, - {"create_exception", &POA_CORBA_Container::create_exception_skel}, - {"create_local_interface", &POA_CORBA_Container::create_local_interface_skel}, - {"contents", &POA_CORBA_Container::contents_skel}, - {"create_abstract_interface", &POA_CORBA_Container::create_abstract_interface_skel}, - {"create_value_box", &POA_CORBA_Container::create_value_box_skel}, - {"create_alias", &POA_CORBA_Container::create_alias_skel}, + {"lookup", &POA_CORBA_Container::lookup_skel}, + {"destroy", &POA_CORBA_Container::destroy_skel}, + {"lookup_name", &POA_CORBA_Container::lookup_name_skel}, + {"create_value", &POA_CORBA_Container::create_value_skel}, + {"create_module", &POA_CORBA_Container::create_module_skel}, + {"create_native", &POA_CORBA_Container::create_native_skel}, + {"create_interface", &POA_CORBA_Container::create_interface_skel}, + {"create_union", &POA_CORBA_Container::create_union_skel}, + {"create_struct", &POA_CORBA_Container::create_struct_skel}, + {"create_constant", &POA_CORBA_Container::create_constant_skel}, + {"create_exception", &POA_CORBA_Container::create_exception_skel}, + {"create_local_interface", &POA_CORBA_Container::create_local_interface_skel}, + {"contents", &POA_CORBA_Container::contents_skel}, + {"create_abstract_interface", &POA_CORBA_Container::create_abstract_interface_skel}, + {"create_value_box", &POA_CORBA_Container::create_value_box_skel}, + {"create_alias", &POA_CORBA_Container::create_alias_skel}, {"_interface", &POA_CORBA_Container::_interface_skel}, - {"create_enum", &POA_CORBA_Container::create_enum_skel}, - {"describe_contents", &POA_CORBA_Container::describe_contents_skel}, - {"_get_def_kind", &POA_CORBA_Container::_get_def_kind_skel}, + {"create_enum", &POA_CORBA_Container::create_enum_skel}, + {"describe_contents", &POA_CORBA_Container::describe_contents_skel}, + {"_get_def_kind", &POA_CORBA_Container::_get_def_kind_skel}, {"_is_a", &POA_CORBA_Container::_is_a_skel}, {"_non_existent", &POA_CORBA_Container::_non_existent_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, -1, -1, 6, 7, -1, -10, -2, 8, 9, -42, - -1, -1, 12, 13, 14, -1, 15, 16, 17, 18, -1, 19, 20, 21, - -1, -1, 22, 23, 24, 25, -1, 26, -1, -1, 27, + -1, -1, -1, -1, -1, -1, 6, 7, -1, -10, -2, 8, 9, -42, + -1, -1, 12, 13, 14, -1, 15, 16, 17, 18, -1, 19, 20, 21, + -1, -1, 22, 23, 24, 25, -1, 26, -1, -1, 27, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -4166,7 +4168,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Container *tao_impl , const char * search_name, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4175,23 +4177,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4202,7 +4204,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_lookup (const TAO_ServerRequestInfo_CORBA_Container_lookup &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_lookup &); - + private: POA_CORBA_Container *_tao_impl; const char * search_name_; @@ -4229,16 +4231,16 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (CORBA::Environment &ACE Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= search_name_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -4250,11 +4252,11 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (CORBA::Environment &AC Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4263,11 +4265,11 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::result (CORBA::Environment &ACE_TR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -4289,7 +4291,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_lookup::result (CORBA_Contained_ptr result) { // Update the result. @@ -4305,7 +4307,7 @@ public: , CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4314,23 +4316,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4341,7 +4343,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_contents (const TAO_ServerRequestInfo_CORBA_Container_contents &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_contents &); - + private: POA_CORBA_Container *_tao_impl; const CORBA::DefinitionKind & limit_type_; @@ -4371,19 +4373,19 @@ TAO_ServerRequestInfo_CORBA_Container_contents::arguments (CORBA::Environment &A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (2); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->limit_type_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_); (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -4395,11 +4397,11 @@ TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (CORBA::Environment & Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_contents::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4408,11 +4410,11 @@ TAO_ServerRequestInfo_CORBA_Container_contents::result (CORBA::Environment &ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -4434,7 +4436,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_contents::result (CORBA_ContainedSeq * result) { // Update the result. @@ -4452,7 +4454,7 @@ public: const CORBA::Long & levels_to_search, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4461,23 +4463,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4488,7 +4490,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_lookup_name (const TAO_ServerRequestInfo_CORBA_Container_lookup_name &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_lookup_name &); - + private: POA_CORBA_Container *_tao_impl; const char * search_name_; @@ -4524,12 +4526,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= search_name_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -4542,7 +4544,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_); (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -4554,11 +4556,11 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4567,11 +4569,11 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -4593,7 +4595,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (CORBA_ContainedSeq * result) { // Update the result. @@ -4610,7 +4612,7 @@ public: CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, const CORBA::Long & max_returned_objs, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4619,23 +4621,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4646,7 +4648,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_describe_contents (const TAO_ServerRequestInfo_CORBA_Container_describe_contents &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_describe_contents &); - + private: POA_CORBA_Container *_tao_impl; const CORBA::DefinitionKind & limit_type_; @@ -4679,12 +4681,12 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (3); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->limit_type_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -4694,7 +4696,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Envir (*parameter_list)[len].argument <<= max_returned_objs_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -4706,11 +4708,11 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4719,11 +4721,11 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -4745,7 +4747,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (CORBA_Container::DescriptionSeq * result) { // Update the result. @@ -4762,7 +4764,7 @@ public: const char * id, const char * name, const char * version, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4771,23 +4773,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4798,7 +4800,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_module (const TAO_ServerRequestInfo_CORBA_Container_create_module &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_module &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -4831,12 +4833,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (3); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -4846,7 +4848,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environme (*parameter_list)[len].argument <<= version_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -4858,11 +4860,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4871,11 +4873,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -4897,7 +4899,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_module::result (CORBA_ModuleDef_ptr result) { // Update the result. @@ -4916,7 +4918,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4925,23 +4927,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4952,7 +4954,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_constant (const TAO_ServerRequestInfo_CORBA_Container_create_constant &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_constant &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -4991,12 +4993,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (5); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -5012,7 +5014,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environ (*parameter_list)[len].argument <<= value_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5024,11 +5026,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5037,11 +5039,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5063,7 +5065,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_constant::result (CORBA_ConstantDef_ptr result) { // Update the result. @@ -5081,7 +5083,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5090,23 +5092,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5117,7 +5119,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_struct (const TAO_ServerRequestInfo_CORBA_Container_create_struct &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_struct &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -5153,12 +5155,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -5171,7 +5173,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environme (*parameter_list)[len].argument <<= this->members_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5183,11 +5185,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5196,11 +5198,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5222,7 +5224,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_struct::result (CORBA_StructDef_ptr result) { // Update the result. @@ -5241,7 +5243,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5250,23 +5252,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5277,7 +5279,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_union (const TAO_ServerRequestInfo_CORBA_Container_create_union &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_union &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -5316,12 +5318,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environmen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (5); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -5337,7 +5339,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environmen (*parameter_list)[len].argument <<= this->members_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5349,11 +5351,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (CORBA::Environme Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5362,11 +5364,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::result (CORBA::Environment & CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5388,7 +5390,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_union::result (CORBA_UnionDef_ptr result) { // Update the result. @@ -5406,7 +5408,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5415,23 +5417,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5442,7 +5444,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_enum (const TAO_ServerRequestInfo_CORBA_Container_create_enum &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_enum &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -5478,12 +5480,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -5496,7 +5498,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment (*parameter_list)[len].argument <<= this->members_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5508,11 +5510,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5521,11 +5523,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5547,7 +5549,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_enum::result (CORBA_EnumDef_ptr result) { // Update the result. @@ -5565,7 +5567,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5574,23 +5576,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5601,7 +5603,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_alias (const TAO_ServerRequestInfo_CORBA_Container_create_alias &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_alias &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -5637,12 +5639,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environmen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -5655,7 +5657,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environmen (*parameter_list)[len].argument <<= this->original_type_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5667,11 +5669,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (CORBA::Environme Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5680,11 +5682,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::result (CORBA::Environment & CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5706,7 +5708,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_alias::result (CORBA_AliasDef_ptr result) { // Update the result. @@ -5724,7 +5726,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5733,23 +5735,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5760,7 +5762,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_interface (const TAO_ServerRequestInfo_CORBA_Container_create_interface &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_interface &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -5796,12 +5798,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Enviro Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -5814,7 +5816,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Enviro (*parameter_list)[len].argument <<= this->base_interfaces_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5826,11 +5828,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (CORBA::Envir Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5839,11 +5841,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::result (CORBA::Environme CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5865,7 +5867,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_interface::result (CORBA_InterfaceDef_ptr result) { // Update the result. @@ -5889,7 +5891,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5898,23 +5900,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5925,7 +5927,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_value (const TAO_ServerRequestInfo_CORBA_Container_create_value &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_value &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -5979,12 +5981,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environmen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (10); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -6015,7 +6017,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environmen (*parameter_list)[len].argument <<= this->initializers_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6027,11 +6029,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (CORBA::Environme Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6040,11 +6042,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::result (CORBA::Environment & CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6066,7 +6068,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_value::result (CORBA_ValueDef_ptr result) { // Update the result. @@ -6084,7 +6086,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6093,23 +6095,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6120,7 +6122,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_value_box (const TAO_ServerRequestInfo_CORBA_Container_create_value_box &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_value_box &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -6156,12 +6158,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Enviro Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -6174,7 +6176,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Enviro (*parameter_list)[len].argument <<= this->original_type_def_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6186,11 +6188,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (CORBA::Envir Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6199,11 +6201,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (CORBA::Environme CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6225,7 +6227,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (CORBA_ValueBoxDef_ptr result) { // Update the result. @@ -6243,7 +6245,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6252,23 +6254,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6279,7 +6281,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_exception (const TAO_ServerRequestInfo_CORBA_Container_create_exception &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_exception &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -6315,12 +6317,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Enviro Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -6333,7 +6335,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Enviro (*parameter_list)[len].argument <<= this->members_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6345,11 +6347,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (CORBA::Envir Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6358,11 +6360,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::result (CORBA::Environme CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6384,7 +6386,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_exception::result (CORBA_ExceptionDef_ptr result) { // Update the result. @@ -6401,7 +6403,7 @@ public: const char * id, const char * name, const char * version, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6410,23 +6412,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6437,7 +6439,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_native (const TAO_ServerRequestInfo_CORBA_Container_create_native &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_native &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -6470,12 +6472,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (3); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -6485,7 +6487,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environme (*parameter_list)[len].argument <<= version_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6497,11 +6499,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6510,11 +6512,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6536,7 +6538,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_native::result (CORBA_NativeDef_ptr result) { // Update the result. @@ -6554,7 +6556,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6563,23 +6565,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6590,7 +6592,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface (const TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -6626,12 +6628,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -6644,7 +6646,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORB (*parameter_list)[len].argument <<= this->base_interfaces_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6656,11 +6658,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6669,11 +6671,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6695,7 +6697,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA_AbstractInterfaceDef_ptr result) { // Update the result. @@ -6713,7 +6715,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6722,23 +6724,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6749,7 +6751,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Container_create_local_interface (const TAO_ServerRequestInfo_CORBA_Container_create_local_interface &); void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_local_interface &); - + private: POA_CORBA_Container *_tao_impl; const char * id_; @@ -6785,12 +6787,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -6803,7 +6805,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA:: (*parameter_list)[len].argument <<= this->base_interfaces_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6815,11 +6817,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (CORBA: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6828,11 +6830,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Env CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6854,7 +6856,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA_LocalInterfaceDef_ptr result) { // Update the result. @@ -6878,14 +6880,14 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::_TAO_CORBA_Container_Strategized_ { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_Container_Strategized_Proxy_Broker::~_TAO_CORBA_Container_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_Container_Proxy_Impl& @@ -6895,26 +6897,27 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_Container_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -6927,7 +6930,7 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -6937,9 +6940,9 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -6959,13 +6962,13 @@ _TAO_CORBA_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_Container_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_Container_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_Container_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_Container_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_Container_Proxy_Broker_Factory_Initializer)); @@ -7672,7 +7675,7 @@ void POA_CORBA_Container::lookup_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_Contained_var _tao_retval; CORBA::String_var search_name; if (!( @@ -7684,12 +7687,12 @@ void POA_CORBA_Container::lookup_skel ( #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_CORBA_Container_lookup ri ( _tao_server_request, _tao_upcall, @@ -7697,20 +7700,20 @@ void POA_CORBA_Container::lookup_skel ( search_name.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->lookup ( search_name.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_Contained_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -7727,11 +7730,11 @@ void POA_CORBA_Container::lookup_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7739,11 +7742,11 @@ void POA_CORBA_Container::lookup_skel ( 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 ()) )) @@ -7751,7 +7754,7 @@ void POA_CORBA_Container::lookup_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7766,7 +7769,7 @@ void POA_CORBA_Container::contents_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_ContainedSeq_var _tao_retval; CORBA::DefinitionKind limit_type; CORBA::Boolean exclude_inherited; @@ -7780,12 +7783,12 @@ void POA_CORBA_Container::contents_skel ( #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_CORBA_Container_contents ri ( _tao_server_request, _tao_upcall, @@ -7794,21 +7797,21 @@ void POA_CORBA_Container::contents_skel ( exclude_inherited, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->contents ( limit_type, exclude_inherited, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ContainedSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -7825,11 +7828,11 @@ void POA_CORBA_Container::contents_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7837,11 +7840,11 @@ void POA_CORBA_Container::contents_skel ( 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 ()) )) @@ -7849,7 +7852,7 @@ void POA_CORBA_Container::contents_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7864,7 +7867,7 @@ void POA_CORBA_Container::lookup_name_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_ContainedSeq_var _tao_retval; CORBA::String_var search_name; CORBA::Long levels_to_search; @@ -7882,12 +7885,12 @@ void POA_CORBA_Container::lookup_name_skel ( #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_CORBA_Container_lookup_name ri ( _tao_server_request, _tao_upcall, @@ -7898,14 +7901,14 @@ void POA_CORBA_Container::lookup_name_skel ( exclude_inherited, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->lookup_name ( search_name.in (), levels_to_search, @@ -7914,7 +7917,7 @@ void POA_CORBA_Container::lookup_name_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ContainedSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -7931,11 +7934,11 @@ void POA_CORBA_Container::lookup_name_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7943,11 +7946,11 @@ void POA_CORBA_Container::lookup_name_skel ( 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 ()) )) @@ -7955,7 +7958,7 @@ void POA_CORBA_Container::lookup_name_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7970,7 +7973,7 @@ void POA_CORBA_Container::describe_contents_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_Container::DescriptionSeq_var _tao_retval; CORBA::DefinitionKind limit_type; CORBA::Boolean exclude_inherited; @@ -7986,12 +7989,12 @@ void POA_CORBA_Container::describe_contents_skel ( #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_CORBA_Container_describe_contents ri ( _tao_server_request, _tao_upcall, @@ -8001,14 +8004,14 @@ void POA_CORBA_Container::describe_contents_skel ( max_returned_objs, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->describe_contents ( limit_type, exclude_inherited, @@ -8016,7 +8019,7 @@ void POA_CORBA_Container::describe_contents_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8033,11 +8036,11 @@ void POA_CORBA_Container::describe_contents_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8045,11 +8048,11 @@ void POA_CORBA_Container::describe_contents_skel ( 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 ()) )) @@ -8057,7 +8060,7 @@ void POA_CORBA_Container::describe_contents_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8072,7 +8075,7 @@ void POA_CORBA_Container::create_module_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_ModuleDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8088,12 +8091,12 @@ void POA_CORBA_Container::create_module_skel ( #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_CORBA_Container_create_module ri ( _tao_server_request, _tao_upcall, @@ -8103,14 +8106,14 @@ void POA_CORBA_Container::create_module_skel ( version.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_module ( id.in (), name.in (), @@ -8118,7 +8121,7 @@ void POA_CORBA_Container::create_module_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ModuleDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8135,11 +8138,11 @@ void POA_CORBA_Container::create_module_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8147,11 +8150,11 @@ void POA_CORBA_Container::create_module_skel ( 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 ()) )) @@ -8159,7 +8162,7 @@ void POA_CORBA_Container::create_module_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8174,7 +8177,7 @@ void POA_CORBA_Container::create_constant_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_ConstantDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8194,12 +8197,12 @@ void POA_CORBA_Container::create_constant_skel ( #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_CORBA_Container_create_constant ri ( _tao_server_request, _tao_upcall, @@ -8211,14 +8214,14 @@ void POA_CORBA_Container::create_constant_skel ( value, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_constant ( id.in (), name.in (), @@ -8228,7 +8231,7 @@ void POA_CORBA_Container::create_constant_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ConstantDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8245,11 +8248,11 @@ void POA_CORBA_Container::create_constant_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8257,11 +8260,11 @@ void POA_CORBA_Container::create_constant_skel ( 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 ()) )) @@ -8269,7 +8272,7 @@ void POA_CORBA_Container::create_constant_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8284,7 +8287,7 @@ void POA_CORBA_Container::create_struct_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_StructDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8302,12 +8305,12 @@ void POA_CORBA_Container::create_struct_skel ( #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_CORBA_Container_create_struct ri ( _tao_server_request, _tao_upcall, @@ -8318,14 +8321,14 @@ void POA_CORBA_Container::create_struct_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_struct ( id.in (), name.in (), @@ -8334,7 +8337,7 @@ void POA_CORBA_Container::create_struct_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_StructDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8351,11 +8354,11 @@ void POA_CORBA_Container::create_struct_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8363,11 +8366,11 @@ void POA_CORBA_Container::create_struct_skel ( 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 ()) )) @@ -8375,7 +8378,7 @@ void POA_CORBA_Container::create_struct_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8390,7 +8393,7 @@ void POA_CORBA_Container::create_union_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_UnionDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8410,12 +8413,12 @@ void POA_CORBA_Container::create_union_skel ( #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_CORBA_Container_create_union ri ( _tao_server_request, _tao_upcall, @@ -8427,14 +8430,14 @@ void POA_CORBA_Container::create_union_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_union ( id.in (), name.in (), @@ -8444,7 +8447,7 @@ void POA_CORBA_Container::create_union_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_UnionDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8461,11 +8464,11 @@ void POA_CORBA_Container::create_union_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8473,11 +8476,11 @@ void POA_CORBA_Container::create_union_skel ( 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 ()) )) @@ -8485,7 +8488,7 @@ void POA_CORBA_Container::create_union_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8500,7 +8503,7 @@ void POA_CORBA_Container::create_enum_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_EnumDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8518,12 +8521,12 @@ void POA_CORBA_Container::create_enum_skel ( #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_CORBA_Container_create_enum ri ( _tao_server_request, _tao_upcall, @@ -8534,14 +8537,14 @@ void POA_CORBA_Container::create_enum_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_enum ( id.in (), name.in (), @@ -8550,7 +8553,7 @@ void POA_CORBA_Container::create_enum_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_EnumDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8567,11 +8570,11 @@ void POA_CORBA_Container::create_enum_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8579,11 +8582,11 @@ void POA_CORBA_Container::create_enum_skel ( 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 ()) )) @@ -8591,7 +8594,7 @@ void POA_CORBA_Container::create_enum_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8606,7 +8609,7 @@ void POA_CORBA_Container::create_alias_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_AliasDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8624,12 +8627,12 @@ void POA_CORBA_Container::create_alias_skel ( #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_CORBA_Container_create_alias ri ( _tao_server_request, _tao_upcall, @@ -8640,14 +8643,14 @@ void POA_CORBA_Container::create_alias_skel ( original_type.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_alias ( id.in (), name.in (), @@ -8656,7 +8659,7 @@ void POA_CORBA_Container::create_alias_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_AliasDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8673,11 +8676,11 @@ void POA_CORBA_Container::create_alias_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8685,11 +8688,11 @@ void POA_CORBA_Container::create_alias_skel ( 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 ()) )) @@ -8697,7 +8700,7 @@ void POA_CORBA_Container::create_alias_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8712,7 +8715,7 @@ void POA_CORBA_Container::create_interface_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_InterfaceDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8730,12 +8733,12 @@ void POA_CORBA_Container::create_interface_skel ( #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_CORBA_Container_create_interface ri ( _tao_server_request, _tao_upcall, @@ -8746,14 +8749,14 @@ void POA_CORBA_Container::create_interface_skel ( base_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_interface ( id.in (), name.in (), @@ -8762,7 +8765,7 @@ void POA_CORBA_Container::create_interface_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8779,11 +8782,11 @@ void POA_CORBA_Container::create_interface_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8791,11 +8794,11 @@ void POA_CORBA_Container::create_interface_skel ( 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 ()) )) @@ -8803,7 +8806,7 @@ void POA_CORBA_Container::create_interface_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8818,7 +8821,7 @@ void POA_CORBA_Container::create_value_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_ValueDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8848,12 +8851,12 @@ void POA_CORBA_Container::create_value_skel ( #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_CORBA_Container_create_value ri ( _tao_server_request, _tao_upcall, @@ -8870,14 +8873,14 @@ void POA_CORBA_Container::create_value_skel ( initializers, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_value ( id.in (), name.in (), @@ -8892,7 +8895,7 @@ void POA_CORBA_Container::create_value_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ValueDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8909,11 +8912,11 @@ void POA_CORBA_Container::create_value_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8921,11 +8924,11 @@ void POA_CORBA_Container::create_value_skel ( 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 ()) )) @@ -8933,7 +8936,7 @@ void POA_CORBA_Container::create_value_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8948,7 +8951,7 @@ void POA_CORBA_Container::create_value_box_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_ValueBoxDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8966,12 +8969,12 @@ void POA_CORBA_Container::create_value_box_skel ( #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_CORBA_Container_create_value_box ri ( _tao_server_request, _tao_upcall, @@ -8982,14 +8985,14 @@ void POA_CORBA_Container::create_value_box_skel ( original_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_value_box ( id.in (), name.in (), @@ -8998,7 +9001,7 @@ void POA_CORBA_Container::create_value_box_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -9015,11 +9018,11 @@ void POA_CORBA_Container::create_value_box_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9027,11 +9030,11 @@ void POA_CORBA_Container::create_value_box_skel ( 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 ()) )) @@ -9039,7 +9042,7 @@ void POA_CORBA_Container::create_value_box_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -9054,7 +9057,7 @@ void POA_CORBA_Container::create_exception_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_ExceptionDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -9072,12 +9075,12 @@ void POA_CORBA_Container::create_exception_skel ( #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_CORBA_Container_create_exception ri ( _tao_server_request, _tao_upcall, @@ -9088,14 +9091,14 @@ void POA_CORBA_Container::create_exception_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_exception ( id.in (), name.in (), @@ -9104,7 +9107,7 @@ void POA_CORBA_Container::create_exception_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ExceptionDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -9121,11 +9124,11 @@ void POA_CORBA_Container::create_exception_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9133,11 +9136,11 @@ void POA_CORBA_Container::create_exception_skel ( 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 ()) )) @@ -9145,7 +9148,7 @@ void POA_CORBA_Container::create_exception_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -9160,7 +9163,7 @@ void POA_CORBA_Container::create_native_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_NativeDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -9176,12 +9179,12 @@ void POA_CORBA_Container::create_native_skel ( #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_CORBA_Container_create_native ri ( _tao_server_request, _tao_upcall, @@ -9191,14 +9194,14 @@ void POA_CORBA_Container::create_native_skel ( version.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_native ( id.in (), name.in (), @@ -9206,7 +9209,7 @@ void POA_CORBA_Container::create_native_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_NativeDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -9223,11 +9226,11 @@ void POA_CORBA_Container::create_native_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9235,11 +9238,11 @@ void POA_CORBA_Container::create_native_skel ( 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 ()) )) @@ -9247,7 +9250,7 @@ void POA_CORBA_Container::create_native_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -9262,7 +9265,7 @@ void POA_CORBA_Container::create_abstract_interface_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_AbstractInterfaceDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -9280,12 +9283,12 @@ void POA_CORBA_Container::create_abstract_interface_skel ( #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_CORBA_Container_create_abstract_interface ri ( _tao_server_request, _tao_upcall, @@ -9296,14 +9299,14 @@ void POA_CORBA_Container::create_abstract_interface_skel ( base_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_abstract_interface ( id.in (), name.in (), @@ -9312,7 +9315,7 @@ void POA_CORBA_Container::create_abstract_interface_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_AbstractInterfaceDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -9329,11 +9332,11 @@ void POA_CORBA_Container::create_abstract_interface_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9341,11 +9344,11 @@ void POA_CORBA_Container::create_abstract_interface_skel ( 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 ()) )) @@ -9353,7 +9356,7 @@ void POA_CORBA_Container::create_abstract_interface_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -9368,7 +9371,7 @@ void POA_CORBA_Container::create_local_interface_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Container *_tao_impl = ACE_static_cast (POA_CORBA_Container *, _tao_object_reference); - + CORBA_LocalInterfaceDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -9386,12 +9389,12 @@ void POA_CORBA_Container::create_local_interface_skel ( #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_CORBA_Container_create_local_interface ri ( _tao_server_request, _tao_upcall, @@ -9402,14 +9405,14 @@ void POA_CORBA_Container::create_local_interface_skel ( base_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_local_interface ( id.in (), name.in (), @@ -9418,7 +9421,7 @@ void POA_CORBA_Container::create_local_interface_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_LocalInterfaceDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -9435,11 +9438,11 @@ void POA_CORBA_Container::create_local_interface_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9447,11 +9450,11 @@ void POA_CORBA_Container::create_local_interface_skel ( 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 ()) )) @@ -9459,13 +9462,13 @@ void POA_CORBA_Container::create_local_interface_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_Container::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9477,10 +9480,10 @@ void POA_CORBA_Container::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -9488,7 +9491,7 @@ void POA_CORBA_Container::_is_a_skel ( } void POA_CORBA_Container::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9497,7 +9500,7 @@ void POA_CORBA_Container::_non_existent_skel ( POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -9505,7 +9508,7 @@ void POA_CORBA_Container::_non_existent_skel ( } void POA_CORBA_Container::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9514,26 +9517,26 @@ void POA_CORBA_Container::_interface_skel ( POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -9545,7 +9548,7 @@ void POA_CORBA_Container::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -9559,7 +9562,7 @@ CORBA::Boolean POA_CORBA_Container::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || @@ -9601,20 +9604,20 @@ POA_CORBA_Container::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_Container::_unchecked_narrow (obj.in ()); } @@ -9699,12 +9702,12 @@ TAO_CORBA_IDLType_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA_IDLType::_is_a_skel}, {"",0}, - {"destroy", &POA_CORBA_IDLType::destroy_skel}, + {"destroy", &POA_CORBA_IDLType::destroy_skel}, {"",0}, - {"_get_type", &POA_CORBA_IDLType::_get_type_skel}, + {"_get_type", &POA_CORBA_IDLType::_get_type_skel}, {"_interface", &POA_CORBA_IDLType::_interface_skel}, {"",0},{"",0}, - {"_get_def_kind", &POA_CORBA_IDLType::_get_def_kind_skel}, + {"_get_def_kind", &POA_CORBA_IDLType::_get_def_kind_skel}, {"",0},{"",0},{"",0},{"",0}, {"_non_existent", &POA_CORBA_IDLType::_non_existent_skel}, }; @@ -9734,7 +9737,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IDLType *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -9743,23 +9746,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -9770,7 +9773,7 @@ public: private: TAO_ServerRequestInfo_CORBA_IDLType_type_get (const TAO_ServerRequestInfo_CORBA_IDLType_type_get &); void operator= (const TAO_ServerRequestInfo_CORBA_IDLType_type_get &); - + private: POA_CORBA_IDLType *_tao_impl; CORBA::TypeCode_ptr _result; @@ -9794,7 +9797,7 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (CORBA::Environment &ACE Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -9806,11 +9809,11 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (CORBA::Environment &AC Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9819,11 +9822,11 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (CORBA::Environment &ACE_TR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9845,7 +9848,7 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -9869,14 +9872,14 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::_TAO_CORBA_IDLType_Strategized_Prox { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_IDLType_Strategized_Proxy_Broker::~_TAO_CORBA_IDLType_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_IDLType_Proxy_Impl& @@ -9886,26 +9889,27 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_IDLType_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -9918,7 +9922,7 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -9928,9 +9932,9 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -9950,13 +9954,13 @@ _TAO_CORBA_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_IDLType_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_IDLType_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_IDLType_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_IDLType_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_IDLType_Proxy_Broker_Factory_Initializer)); @@ -10030,37 +10034,37 @@ void POA_CORBA_IDLType::_get_type_skel ( { POA_CORBA_IDLType *_tao_impl = ACE_static_cast (POA_CORBA_IDLType *, _tao_object_reference); - + CORBA::TypeCode_var _tao_retval; #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_CORBA_IDLType_type_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -10077,11 +10081,11 @@ void POA_CORBA_IDLType::_get_type_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -10089,11 +10093,11 @@ void POA_CORBA_IDLType::_get_type_skel ( 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 ()) )) @@ -10101,13 +10105,13 @@ void POA_CORBA_IDLType::_get_type_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_IDLType::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10119,10 +10123,10 @@ void POA_CORBA_IDLType::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -10130,7 +10134,7 @@ void POA_CORBA_IDLType::_is_a_skel ( } void POA_CORBA_IDLType::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10139,7 +10143,7 @@ void POA_CORBA_IDLType::_non_existent_skel ( POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -10147,7 +10151,7 @@ void POA_CORBA_IDLType::_non_existent_skel ( } void POA_CORBA_IDLType::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10156,26 +10160,26 @@ void POA_CORBA_IDLType::_interface_skel ( POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -10187,7 +10191,7 @@ void POA_CORBA_IDLType::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -10201,7 +10205,7 @@ CORBA::Boolean POA_CORBA_IDLType::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || @@ -10243,20 +10247,20 @@ POA_CORBA_IDLType::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_IDLType::_unchecked_narrow (obj.in ()); } @@ -10339,30 +10343,30 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_TypedefDef::move_skel}, + {"move", &POA_CORBA_TypedefDef::move_skel}, {"_is_a", &POA_CORBA_TypedefDef::_is_a_skel}, - {"_get_id", &POA_CORBA_TypedefDef::_get_id_skel}, - {"_set_id", &POA_CORBA_TypedefDef::_set_id_skel}, - {"describe", &POA_CORBA_TypedefDef::describe_skel}, - {"_get_name", &POA_CORBA_TypedefDef::_get_name_skel}, - {"_get_type", &POA_CORBA_TypedefDef::_get_type_skel}, - {"_set_name", &POA_CORBA_TypedefDef::_set_name_skel}, + {"_get_id", &POA_CORBA_TypedefDef::_get_id_skel}, + {"_set_id", &POA_CORBA_TypedefDef::_set_id_skel}, + {"describe", &POA_CORBA_TypedefDef::describe_skel}, + {"_get_name", &POA_CORBA_TypedefDef::_get_name_skel}, + {"_get_type", &POA_CORBA_TypedefDef::_get_type_skel}, + {"_set_name", &POA_CORBA_TypedefDef::_set_name_skel}, {"_interface", &POA_CORBA_TypedefDef::_interface_skel}, - {"_get_version", &POA_CORBA_TypedefDef::_get_version_skel}, - {"_set_version", &POA_CORBA_TypedefDef::_set_version_skel}, - {"_get_def_kind", &POA_CORBA_TypedefDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_CORBA_TypedefDef::_get_defined_in_skel}, - {"destroy", &POA_CORBA_TypedefDef::destroy_skel}, - {"_get_absolute_name", &POA_CORBA_TypedefDef::_get_absolute_name_skel}, + {"_get_version", &POA_CORBA_TypedefDef::_get_version_skel}, + {"_set_version", &POA_CORBA_TypedefDef::_set_version_skel}, + {"_get_def_kind", &POA_CORBA_TypedefDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_CORBA_TypedefDef::_get_defined_in_skel}, + {"destroy", &POA_CORBA_TypedefDef::destroy_skel}, + {"_get_absolute_name", &POA_CORBA_TypedefDef::_get_absolute_name_skel}, {"_non_existent", &POA_CORBA_TypedefDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_TypedefDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_CORBA_TypedefDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -3, -13, -2, 4, 5, -1, 48, 8, -45, 12, -1, -46, 15, - -1, 16, -1, 17, 18, -6, -2, -1, -1, 19, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 20, + -9, -3, -13, -2, 4, 5, -1, 48, 8, -45, 12, -1, -46, 15, + -1, 16, -1, 17, 18, -6, -2, -1, -1, 19, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 20, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -10417,14 +10421,14 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::_TAO_CORBA_TypedefDef_Strategize { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::~_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_TypedefDef_Proxy_Impl& @@ -10434,26 +10438,27 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -10466,7 +10471,7 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -10476,9 +10481,9 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -10498,13 +10503,13 @@ _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_Initializer)); @@ -10541,7 +10546,7 @@ POA_CORBA_TypedefDef::~POA_CORBA_TypedefDef (void) } void POA_CORBA_TypedefDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10553,10 +10558,10 @@ void POA_CORBA_TypedefDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -10564,7 +10569,7 @@ void POA_CORBA_TypedefDef::_is_a_skel ( } void POA_CORBA_TypedefDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10573,7 +10578,7 @@ void POA_CORBA_TypedefDef::_non_existent_skel ( POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -10581,7 +10586,7 @@ void POA_CORBA_TypedefDef::_non_existent_skel ( } void POA_CORBA_TypedefDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10590,26 +10595,26 @@ void POA_CORBA_TypedefDef::_interface_skel ( POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -10621,7 +10626,7 @@ void POA_CORBA_TypedefDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -10635,7 +10640,7 @@ CORBA::Boolean POA_CORBA_TypedefDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -10683,20 +10688,20 @@ POA_CORBA_TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_TypedefDef::_unchecked_narrow (obj.in ()); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp index f18d0a4a38d..d203640f5fb 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp @@ -126,44 +126,44 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int { {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0}, {"",0},{"",0}, - {"destroy", &POA_CORBA_Repository::destroy_skel}, - {"create_array", &POA_CORBA_Repository::create_array_skel}, - {"create_struct", &POA_CORBA_Repository::create_struct_skel}, - {"lookup", &POA_CORBA_Repository::lookup_skel}, - {"create_constant", &POA_CORBA_Repository::create_constant_skel}, - {"create_fixed", &POA_CORBA_Repository::create_fixed_skel}, - {"create_string", &POA_CORBA_Repository::create_string_skel}, - {"create_wstring", &POA_CORBA_Repository::create_wstring_skel}, - {"lookup_id", &POA_CORBA_Repository::lookup_id_skel}, - {"create_value", &POA_CORBA_Repository::create_value_skel}, - {"create_module", &POA_CORBA_Repository::create_module_skel}, - {"create_native", &POA_CORBA_Repository::create_native_skel}, - {"create_sequence", &POA_CORBA_Repository::create_sequence_skel}, - {"create_interface", &POA_CORBA_Repository::create_interface_skel}, - {"create_union", &POA_CORBA_Repository::create_union_skel}, - {"get_primitive", &POA_CORBA_Repository::get_primitive_skel}, - {"lookup_name", &POA_CORBA_Repository::lookup_name_skel}, - {"create_exception", &POA_CORBA_Repository::create_exception_skel}, - {"create_local_interface", &POA_CORBA_Repository::create_local_interface_skel}, - {"create_abstract_interface", &POA_CORBA_Repository::create_abstract_interface_skel}, - {"create_enum", &POA_CORBA_Repository::create_enum_skel}, - {"get_canonical_typecode", &POA_CORBA_Repository::get_canonical_typecode_skel}, - {"contents", &POA_CORBA_Repository::contents_skel}, + {"destroy", &POA_CORBA_Repository::destroy_skel}, + {"create_array", &POA_CORBA_Repository::create_array_skel}, + {"create_struct", &POA_CORBA_Repository::create_struct_skel}, + {"lookup", &POA_CORBA_Repository::lookup_skel}, + {"create_constant", &POA_CORBA_Repository::create_constant_skel}, + {"create_fixed", &POA_CORBA_Repository::create_fixed_skel}, + {"create_string", &POA_CORBA_Repository::create_string_skel}, + {"create_wstring", &POA_CORBA_Repository::create_wstring_skel}, + {"lookup_id", &POA_CORBA_Repository::lookup_id_skel}, + {"create_value", &POA_CORBA_Repository::create_value_skel}, + {"create_module", &POA_CORBA_Repository::create_module_skel}, + {"create_native", &POA_CORBA_Repository::create_native_skel}, + {"create_sequence", &POA_CORBA_Repository::create_sequence_skel}, + {"create_interface", &POA_CORBA_Repository::create_interface_skel}, + {"create_union", &POA_CORBA_Repository::create_union_skel}, + {"get_primitive", &POA_CORBA_Repository::get_primitive_skel}, + {"lookup_name", &POA_CORBA_Repository::lookup_name_skel}, + {"create_exception", &POA_CORBA_Repository::create_exception_skel}, + {"create_local_interface", &POA_CORBA_Repository::create_local_interface_skel}, + {"create_abstract_interface", &POA_CORBA_Repository::create_abstract_interface_skel}, + {"create_enum", &POA_CORBA_Repository::create_enum_skel}, + {"get_canonical_typecode", &POA_CORBA_Repository::get_canonical_typecode_skel}, + {"contents", &POA_CORBA_Repository::contents_skel}, {"_is_a", &POA_CORBA_Repository::_is_a_skel}, - {"create_value_box", &POA_CORBA_Repository::create_value_box_skel}, - {"create_alias", &POA_CORBA_Repository::create_alias_skel}, + {"create_value_box", &POA_CORBA_Repository::create_value_box_skel}, + {"create_alias", &POA_CORBA_Repository::create_alias_skel}, {"_non_existent", &POA_CORBA_Repository::_non_existent_skel}, - {"_get_def_kind", &POA_CORBA_Repository::_get_def_kind_skel}, + {"_get_def_kind", &POA_CORBA_Repository::_get_def_kind_skel}, {"_interface", &POA_CORBA_Repository::_interface_skel}, - {"describe_contents", &POA_CORBA_Repository::describe_contents_skel}, + {"describe_contents", &POA_CORBA_Repository::describe_contents_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -21, -2, 11, 12, 13, - 14, 15, 16, -1, 17, 18, -1, 19, 20, -65, -1, 23, 24, 25, - 26, 27, -1, 28, 29, -1, -1, 30, 31, 32, 33, -1, 34, 35, - 36, 37, -1, -1, -1, 38, -1, -1, 39, 40, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -21, -2, 11, 12, 13, + 14, 15, 16, -1, 17, 18, -1, 19, 20, -65, -1, 23, 24, 25, + 26, 27, -1, 28, 29, -1, -1, 30, 31, 32, 33, -1, 34, 35, + 36, 37, -1, -1, -1, 38, -1, -1, 39, 40, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -209,7 +209,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , const char * search_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -218,23 +218,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -245,7 +245,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Repository_lookup_id (const TAO_ServerRequestInfo_CORBA_Repository_lookup_id &); void operator= (const TAO_ServerRequestInfo_CORBA_Repository_lookup_id &); - + private: POA_CORBA_Repository *_tao_impl; const char * search_id_; @@ -272,16 +272,16 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= search_id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -293,11 +293,11 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -306,11 +306,11 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Environment &AC CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -332,7 +332,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (CORBA_Contained_ptr result) { // Update the result. @@ -347,7 +347,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -356,23 +356,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -383,7 +383,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode (const TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode &); void operator= (const TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode &); - + private: POA_CORBA_Repository *_tao_impl; CORBA::TypeCode_ptr tc_; @@ -410,16 +410,16 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= tc_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -431,11 +431,11 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -444,11 +444,11 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -470,7 +470,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -485,7 +485,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , CORBA::PrimitiveKind & kind, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -494,23 +494,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -521,7 +521,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Repository_get_primitive (const TAO_ServerRequestInfo_CORBA_Repository_get_primitive &); void operator= (const TAO_ServerRequestInfo_CORBA_Repository_get_primitive &); - + private: POA_CORBA_Repository *_tao_impl; const CORBA::PrimitiveKind & kind_; @@ -548,16 +548,16 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (CORBA::Environm Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->kind_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -569,11 +569,11 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (CORBA::Environ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -582,11 +582,11 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -608,7 +608,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (CORBA_PrimitiveDef_ptr result) { // Update the result. @@ -623,7 +623,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , const CORBA::ULong & bound, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -632,23 +632,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -659,7 +659,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Repository_create_string (const TAO_ServerRequestInfo_CORBA_Repository_create_string &); void operator= (const TAO_ServerRequestInfo_CORBA_Repository_create_string &); - + private: POA_CORBA_Repository *_tao_impl; const CORBA::ULong & bound_; @@ -686,16 +686,16 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (CORBA::Environm Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= bound_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -707,11 +707,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (CORBA::Environ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -720,11 +720,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -746,7 +746,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Repository_create_string::result (CORBA_StringDef_ptr result) { // Update the result. @@ -761,7 +761,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , const CORBA::ULong & bound, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -770,23 +770,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -797,7 +797,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Repository_create_wstring (const TAO_ServerRequestInfo_CORBA_Repository_create_wstring &); void operator= (const TAO_ServerRequestInfo_CORBA_Repository_create_wstring &); - + private: POA_CORBA_Repository *_tao_impl; const CORBA::ULong & bound_; @@ -824,16 +824,16 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= bound_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -845,11 +845,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -858,11 +858,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -884,7 +884,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (CORBA_WstringDef_ptr result) { // Update the result. @@ -900,7 +900,7 @@ public: , const CORBA::ULong & bound, CORBA_IDLType_ptr element_type, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -909,23 +909,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -936,7 +936,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Repository_create_sequence (const TAO_ServerRequestInfo_CORBA_Repository_create_sequence &); void operator= (const TAO_ServerRequestInfo_CORBA_Repository_create_sequence &); - + private: POA_CORBA_Repository *_tao_impl; const CORBA::ULong & bound_; @@ -966,19 +966,19 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (CORBA::Enviro Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (2); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= bound_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; (*parameter_list)[len].argument <<= this->element_type_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -990,11 +990,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (CORBA::Envir Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1003,11 +1003,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (CORBA::Environme CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1029,7 +1029,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (CORBA_SequenceDef_ptr result) { // Update the result. @@ -1045,7 +1045,7 @@ public: , const CORBA::ULong & length, CORBA_IDLType_ptr element_type, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1054,23 +1054,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -1081,7 +1081,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Repository_create_array (const TAO_ServerRequestInfo_CORBA_Repository_create_array &); void operator= (const TAO_ServerRequestInfo_CORBA_Repository_create_array &); - + private: POA_CORBA_Repository *_tao_impl; const CORBA::ULong & length_; @@ -1111,19 +1111,19 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (2); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= length_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; (*parameter_list)[len].argument <<= this->element_type_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1135,11 +1135,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1148,11 +1148,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1174,7 +1174,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Repository_create_array::result (CORBA_ArrayDef_ptr result) { // Update the result. @@ -1190,7 +1190,7 @@ public: , const CORBA::UShort & digits, const CORBA::Short & scale, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1199,23 +1199,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -1226,7 +1226,7 @@ public: private: TAO_ServerRequestInfo_CORBA_Repository_create_fixed (const TAO_ServerRequestInfo_CORBA_Repository_create_fixed &); void operator= (const TAO_ServerRequestInfo_CORBA_Repository_create_fixed &); - + private: POA_CORBA_Repository *_tao_impl; const CORBA::UShort & digits_; @@ -1256,19 +1256,19 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (2); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= digits_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; (*parameter_list)[len].argument <<= scale_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1280,11 +1280,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1293,11 +1293,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1319,7 +1319,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (CORBA_FixedDef_ptr result) { // Update the result. @@ -1343,14 +1343,14 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::_TAO_CORBA_Repository_Strategize { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_Repository_Strategized_Proxy_Broker::~_TAO_CORBA_Repository_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_Repository_Proxy_Impl& @@ -1360,26 +1360,27 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_Repository_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -1392,7 +1393,7 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -1402,9 +1403,9 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -1424,13 +1425,13 @@ _TAO_CORBA_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_Repository_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_Repository_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_Repository_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_Repository_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_Repository_Proxy_Broker_Factory_Initializer)); @@ -1745,7 +1746,7 @@ void POA_CORBA_Repository::lookup_id_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Repository *_tao_impl = ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference); - + CORBA_Contained_var _tao_retval; CORBA::String_var search_id; if (!( @@ -1757,12 +1758,12 @@ void POA_CORBA_Repository::lookup_id_skel ( #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_CORBA_Repository_lookup_id ri ( _tao_server_request, _tao_upcall, @@ -1770,20 +1771,20 @@ void POA_CORBA_Repository::lookup_id_skel ( search_id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->lookup_id ( search_id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_Contained_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -1800,11 +1801,11 @@ void POA_CORBA_Repository::lookup_id_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -1812,11 +1813,11 @@ void POA_CORBA_Repository::lookup_id_skel ( 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 ()) )) @@ -1824,7 +1825,7 @@ void POA_CORBA_Repository::lookup_id_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -1839,7 +1840,7 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Repository *_tao_impl = ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference); - + CORBA::TypeCode_var _tao_retval; CORBA::TypeCode_var tc; if (!( @@ -1851,12 +1852,12 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( #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_CORBA_Repository_get_canonical_typecode ri ( _tao_server_request, _tao_upcall, @@ -1864,20 +1865,20 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( tc.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->get_canonical_typecode ( tc.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -1894,11 +1895,11 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -1906,11 +1907,11 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( 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 ()) )) @@ -1918,7 +1919,7 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -1933,7 +1934,7 @@ void POA_CORBA_Repository::get_primitive_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Repository *_tao_impl = ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference); - + CORBA_PrimitiveDef_var _tao_retval; CORBA::PrimitiveKind kind; if (!( @@ -1945,12 +1946,12 @@ void POA_CORBA_Repository::get_primitive_skel ( #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_CORBA_Repository_get_primitive ri ( _tao_server_request, _tao_upcall, @@ -1958,20 +1959,20 @@ void POA_CORBA_Repository::get_primitive_skel ( kind, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->get_primitive ( kind, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_PrimitiveDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -1988,11 +1989,11 @@ void POA_CORBA_Repository::get_primitive_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2000,11 +2001,11 @@ void POA_CORBA_Repository::get_primitive_skel ( 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 ()) )) @@ -2012,7 +2013,7 @@ void POA_CORBA_Repository::get_primitive_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2027,7 +2028,7 @@ void POA_CORBA_Repository::create_string_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Repository *_tao_impl = ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference); - + CORBA_StringDef_var _tao_retval; CORBA::ULong bound; if (!( @@ -2039,12 +2040,12 @@ void POA_CORBA_Repository::create_string_skel ( #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_CORBA_Repository_create_string ri ( _tao_server_request, _tao_upcall, @@ -2052,20 +2053,20 @@ void POA_CORBA_Repository::create_string_skel ( bound, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_string ( bound, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_StringDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2082,11 +2083,11 @@ void POA_CORBA_Repository::create_string_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2094,11 +2095,11 @@ void POA_CORBA_Repository::create_string_skel ( 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 ()) )) @@ -2106,7 +2107,7 @@ void POA_CORBA_Repository::create_string_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2121,7 +2122,7 @@ void POA_CORBA_Repository::create_wstring_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Repository *_tao_impl = ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference); - + CORBA_WstringDef_var _tao_retval; CORBA::ULong bound; if (!( @@ -2133,12 +2134,12 @@ void POA_CORBA_Repository::create_wstring_skel ( #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_CORBA_Repository_create_wstring ri ( _tao_server_request, _tao_upcall, @@ -2146,20 +2147,20 @@ void POA_CORBA_Repository::create_wstring_skel ( bound, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_wstring ( bound, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_WstringDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2176,11 +2177,11 @@ void POA_CORBA_Repository::create_wstring_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2188,11 +2189,11 @@ void POA_CORBA_Repository::create_wstring_skel ( 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 ()) )) @@ -2200,7 +2201,7 @@ void POA_CORBA_Repository::create_wstring_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2215,7 +2216,7 @@ void POA_CORBA_Repository::create_sequence_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Repository *_tao_impl = ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference); - + CORBA_SequenceDef_var _tao_retval; CORBA::ULong bound; CORBA_IDLType_var element_type; @@ -2229,12 +2230,12 @@ void POA_CORBA_Repository::create_sequence_skel ( #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_CORBA_Repository_create_sequence ri ( _tao_server_request, _tao_upcall, @@ -2243,21 +2244,21 @@ void POA_CORBA_Repository::create_sequence_skel ( element_type.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_sequence ( bound, element_type.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_SequenceDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2274,11 +2275,11 @@ void POA_CORBA_Repository::create_sequence_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2286,11 +2287,11 @@ void POA_CORBA_Repository::create_sequence_skel ( 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 ()) )) @@ -2298,7 +2299,7 @@ void POA_CORBA_Repository::create_sequence_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2313,7 +2314,7 @@ void POA_CORBA_Repository::create_array_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Repository *_tao_impl = ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference); - + CORBA_ArrayDef_var _tao_retval; CORBA::ULong length; CORBA_IDLType_var element_type; @@ -2327,12 +2328,12 @@ void POA_CORBA_Repository::create_array_skel ( #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_CORBA_Repository_create_array ri ( _tao_server_request, _tao_upcall, @@ -2341,21 +2342,21 @@ void POA_CORBA_Repository::create_array_skel ( element_type.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_array ( length, element_type.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ArrayDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2372,11 +2373,11 @@ void POA_CORBA_Repository::create_array_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2384,11 +2385,11 @@ void POA_CORBA_Repository::create_array_skel ( 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 ()) )) @@ -2396,7 +2397,7 @@ void POA_CORBA_Repository::create_array_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2411,7 +2412,7 @@ void POA_CORBA_Repository::create_fixed_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_Repository *_tao_impl = ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference); - + CORBA_FixedDef_var _tao_retval; CORBA::UShort digits; CORBA::Short scale; @@ -2425,12 +2426,12 @@ void POA_CORBA_Repository::create_fixed_skel ( #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_CORBA_Repository_create_fixed ri ( _tao_server_request, _tao_upcall, @@ -2439,21 +2440,21 @@ void POA_CORBA_Repository::create_fixed_skel ( scale, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_fixed ( digits, scale, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_FixedDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2470,11 +2471,11 @@ void POA_CORBA_Repository::create_fixed_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2482,11 +2483,11 @@ void POA_CORBA_Repository::create_fixed_skel ( 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 ()) )) @@ -2494,13 +2495,13 @@ void POA_CORBA_Repository::create_fixed_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_Repository::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2512,10 +2513,10 @@ void POA_CORBA_Repository::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -2523,7 +2524,7 @@ void POA_CORBA_Repository::_is_a_skel ( } void POA_CORBA_Repository::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2532,7 +2533,7 @@ void POA_CORBA_Repository::_non_existent_skel ( POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -2540,7 +2541,7 @@ void POA_CORBA_Repository::_non_existent_skel ( } void POA_CORBA_Repository::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2549,26 +2550,26 @@ void POA_CORBA_Repository::_interface_skel ( POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -2580,7 +2581,7 @@ void POA_CORBA_Repository::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -2594,7 +2595,7 @@ CORBA::Boolean POA_CORBA_Repository::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || @@ -2639,20 +2640,20 @@ POA_CORBA_Repository::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_Repository::_unchecked_narrow (obj.in ()); } @@ -2735,48 +2736,48 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_ModuleDef::move_skel}, - {"create_enum", &POA_CORBA_ModuleDef::create_enum_skel}, - {"create_value", &POA_CORBA_ModuleDef::create_value_skel}, - {"create_module", &POA_CORBA_ModuleDef::create_module_skel}, - {"create_native", &POA_CORBA_ModuleDef::create_native_skel}, - {"create_interface", &POA_CORBA_ModuleDef::create_interface_skel}, - {"create_union", &POA_CORBA_ModuleDef::create_union_skel}, - {"create_exception", &POA_CORBA_ModuleDef::create_exception_skel}, - {"create_local_interface", &POA_CORBA_ModuleDef::create_local_interface_skel}, - {"contents", &POA_CORBA_ModuleDef::contents_skel}, - {"create_abstract_interface", &POA_CORBA_ModuleDef::create_abstract_interface_skel}, - {"create_value_box", &POA_CORBA_ModuleDef::create_value_box_skel}, - {"create_alias", &POA_CORBA_ModuleDef::create_alias_skel}, - {"describe", &POA_CORBA_ModuleDef::describe_skel}, - {"_get_name", &POA_CORBA_ModuleDef::_get_name_skel}, - {"_set_name", &POA_CORBA_ModuleDef::_set_name_skel}, + {"move", &POA_CORBA_ModuleDef::move_skel}, + {"create_enum", &POA_CORBA_ModuleDef::create_enum_skel}, + {"create_value", &POA_CORBA_ModuleDef::create_value_skel}, + {"create_module", &POA_CORBA_ModuleDef::create_module_skel}, + {"create_native", &POA_CORBA_ModuleDef::create_native_skel}, + {"create_interface", &POA_CORBA_ModuleDef::create_interface_skel}, + {"create_union", &POA_CORBA_ModuleDef::create_union_skel}, + {"create_exception", &POA_CORBA_ModuleDef::create_exception_skel}, + {"create_local_interface", &POA_CORBA_ModuleDef::create_local_interface_skel}, + {"contents", &POA_CORBA_ModuleDef::contents_skel}, + {"create_abstract_interface", &POA_CORBA_ModuleDef::create_abstract_interface_skel}, + {"create_value_box", &POA_CORBA_ModuleDef::create_value_box_skel}, + {"create_alias", &POA_CORBA_ModuleDef::create_alias_skel}, + {"describe", &POA_CORBA_ModuleDef::describe_skel}, + {"_get_name", &POA_CORBA_ModuleDef::_get_name_skel}, + {"_set_name", &POA_CORBA_ModuleDef::_set_name_skel}, {"_interface", &POA_CORBA_ModuleDef::_interface_skel}, - {"lookup_name", &POA_CORBA_ModuleDef::lookup_name_skel}, - {"destroy", &POA_CORBA_ModuleDef::destroy_skel}, + {"lookup_name", &POA_CORBA_ModuleDef::lookup_name_skel}, + {"destroy", &POA_CORBA_ModuleDef::destroy_skel}, {"_is_a", &POA_CORBA_ModuleDef::_is_a_skel}, - {"lookup", &POA_CORBA_ModuleDef::lookup_skel}, - {"_get_version", &POA_CORBA_ModuleDef::_get_version_skel}, - {"_set_version", &POA_CORBA_ModuleDef::_set_version_skel}, - {"_get_absolute_name", &POA_CORBA_ModuleDef::_get_absolute_name_skel}, - {"_get_defined_in", &POA_CORBA_ModuleDef::_get_defined_in_skel}, - {"create_struct", &POA_CORBA_ModuleDef::create_struct_skel}, - {"create_constant", &POA_CORBA_ModuleDef::create_constant_skel}, - {"_get_id", &POA_CORBA_ModuleDef::_get_id_skel}, - {"_set_id", &POA_CORBA_ModuleDef::_set_id_skel}, - {"_get_containing_repository", &POA_CORBA_ModuleDef::_get_containing_repository_skel}, - {"describe_contents", &POA_CORBA_ModuleDef::describe_contents_skel}, - {"_get_def_kind", &POA_CORBA_ModuleDef::_get_def_kind_skel}, + {"lookup", &POA_CORBA_ModuleDef::lookup_skel}, + {"_get_version", &POA_CORBA_ModuleDef::_get_version_skel}, + {"_set_version", &POA_CORBA_ModuleDef::_set_version_skel}, + {"_get_absolute_name", &POA_CORBA_ModuleDef::_get_absolute_name_skel}, + {"_get_defined_in", &POA_CORBA_ModuleDef::_get_defined_in_skel}, + {"create_struct", &POA_CORBA_ModuleDef::create_struct_skel}, + {"create_constant", &POA_CORBA_ModuleDef::create_constant_skel}, + {"_get_id", &POA_CORBA_ModuleDef::_get_id_skel}, + {"_set_id", &POA_CORBA_ModuleDef::_set_id_skel}, + {"_get_containing_repository", &POA_CORBA_ModuleDef::_get_containing_repository_skel}, + {"describe_contents", &POA_CORBA_ModuleDef::describe_contents_skel}, + {"_get_def_kind", &POA_CORBA_ModuleDef::_get_def_kind_skel}, {"_non_existent", &POA_CORBA_ModuleDef::_non_existent_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, 4, -1, -1, -1, -1, -7, -2, 5, 6, -67, - -1, -1, 9, 10, -1, -18, -2, 11, 12, 13, -1, 14, 15, 16, - 17, -73, 20, 21, 22, -25, -2, 23, 24, -67, 27, -1, 28, -31, - -2, 29, -1, 30, -1, -69, -1, -1, -1, 33, 34, 35, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 36, + -1, -1, -1, -1, 4, -1, -1, -1, -1, -7, -2, 5, 6, -67, + -1, -1, 9, 10, -1, -18, -2, 11, 12, 13, -1, 14, 15, 16, + 17, -73, 20, 21, 22, -25, -2, 23, 24, -67, 27, -1, 28, -31, + -2, 29, -1, 30, -1, -69, -1, -1, -1, 33, 34, 35, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 36, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -2831,14 +2832,14 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::_TAO_CORBA_ModuleDef_Strategized_ { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::~_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_ModuleDef_Proxy_Impl& @@ -2848,26 +2849,27 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -2880,7 +2882,7 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -2890,9 +2892,9 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -2912,13 +2914,13 @@ _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_Initializer)); @@ -2955,7 +2957,7 @@ POA_CORBA_ModuleDef::~POA_CORBA_ModuleDef (void) } void POA_CORBA_ModuleDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2967,10 +2969,10 @@ void POA_CORBA_ModuleDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -2978,7 +2980,7 @@ void POA_CORBA_ModuleDef::_is_a_skel ( } void POA_CORBA_ModuleDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2987,7 +2989,7 @@ void POA_CORBA_ModuleDef::_non_existent_skel ( POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -2995,7 +2997,7 @@ void POA_CORBA_ModuleDef::_non_existent_skel ( } void POA_CORBA_ModuleDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -3004,26 +3006,26 @@ void POA_CORBA_ModuleDef::_interface_skel ( POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -3035,7 +3037,7 @@ void POA_CORBA_ModuleDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -3049,7 +3051,7 @@ CORBA::Boolean POA_CORBA_ModuleDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || @@ -3097,20 +3099,20 @@ POA_CORBA_ModuleDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_ModuleDef::_unchecked_narrow (obj.in ()); } @@ -3193,34 +3195,34 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_ConstantDef::move_skel}, + {"move", &POA_CORBA_ConstantDef::move_skel}, {"_is_a", &POA_CORBA_ConstantDef::_is_a_skel}, - {"_get_id", &POA_CORBA_ConstantDef::_get_id_skel}, - {"_set_id", &POA_CORBA_ConstantDef::_set_id_skel}, - {"describe", &POA_CORBA_ConstantDef::describe_skel}, - {"_get_type", &POA_CORBA_ConstantDef::_get_type_skel}, - {"_set_name", &POA_CORBA_ConstantDef::_set_name_skel}, - {"_get_name", &POA_CORBA_ConstantDef::_get_name_skel}, - {"_get_value", &POA_CORBA_ConstantDef::_get_value_skel}, + {"_get_id", &POA_CORBA_ConstantDef::_get_id_skel}, + {"_set_id", &POA_CORBA_ConstantDef::_set_id_skel}, + {"describe", &POA_CORBA_ConstantDef::describe_skel}, + {"_get_type", &POA_CORBA_ConstantDef::_get_type_skel}, + {"_set_name", &POA_CORBA_ConstantDef::_set_name_skel}, + {"_get_name", &POA_CORBA_ConstantDef::_get_name_skel}, + {"_get_value", &POA_CORBA_ConstantDef::_get_value_skel}, {"_interface", &POA_CORBA_ConstantDef::_interface_skel}, - {"_set_value", &POA_CORBA_ConstantDef::_set_value_skel}, - {"_get_version", &POA_CORBA_ConstantDef::_get_version_skel}, - {"_set_version", &POA_CORBA_ConstantDef::_set_version_skel}, - {"_get_def_kind", &POA_CORBA_ConstantDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_CORBA_ConstantDef::_get_defined_in_skel}, - {"destroy", &POA_CORBA_ConstantDef::destroy_skel}, - {"_get_absolute_name", &POA_CORBA_ConstantDef::_get_absolute_name_skel}, - {"_get_type_def", &POA_CORBA_ConstantDef::_get_type_def_skel}, - {"_set_type_def", &POA_CORBA_ConstantDef::_set_type_def_skel}, + {"_set_value", &POA_CORBA_ConstantDef::_set_value_skel}, + {"_get_version", &POA_CORBA_ConstantDef::_get_version_skel}, + {"_set_version", &POA_CORBA_ConstantDef::_set_version_skel}, + {"_get_def_kind", &POA_CORBA_ConstantDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_CORBA_ConstantDef::_get_defined_in_skel}, + {"destroy", &POA_CORBA_ConstantDef::destroy_skel}, + {"_get_absolute_name", &POA_CORBA_ConstantDef::_get_absolute_name_skel}, + {"_get_type_def", &POA_CORBA_ConstantDef::_get_type_def_skel}, + {"_set_type_def", &POA_CORBA_ConstantDef::_set_type_def_skel}, {"_non_existent", &POA_CORBA_ConstantDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_ConstantDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_CORBA_ConstantDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -12, -3, -15, -2, 4, 5, -1, 53, 8, 46, -46, -1, -46, 17, - -1, 18, -1, 19, 20, -9, -3, -21, -2, -38, -6, -2, -1, -1, - 23, -1, -1, -1, -1, -1, -1, -1, 24, + -12, -3, -15, -2, 4, 5, -1, 53, 8, 46, -46, -1, -46, 17, + -1, 18, -1, 19, 20, -9, -3, -21, -2, -38, -6, -2, -1, -1, + 23, -1, -1, -1, -1, -1, -1, -1, 24, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -3265,7 +3267,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3274,23 +3276,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -3301,7 +3303,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ConstantDef_type_get (const TAO_ServerRequestInfo_CORBA_ConstantDef_type_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ConstantDef_type_get &); - + private: POA_CORBA_ConstantDef *_tao_impl; CORBA::TypeCode_ptr _result; @@ -3325,7 +3327,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -3337,11 +3339,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3350,11 +3352,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::Environment &AC CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -3376,7 +3378,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -3390,7 +3392,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3399,23 +3401,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -3426,7 +3428,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (const TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get &); - + private: POA_CORBA_ConstantDef *_tao_impl; CORBA_IDLType_ptr _result; @@ -3450,7 +3452,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (CORBA::Environm Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -3462,11 +3464,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (CORBA::Environ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3475,11 +3477,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -3501,7 +3503,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA_IDLType_ptr result) { // Update the result. @@ -3516,7 +3518,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl , CORBA_IDLType_ptr type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3525,37 +3527,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set (const TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set &); - + private: POA_CORBA_ConstantDef *_tao_impl; CORBA_IDLType_ptr type_def_; - + }; TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set ( @@ -3578,16 +3580,16 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (CORBA::Environm Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->type_def_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -3599,11 +3601,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (CORBA::Environ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3612,7 +3614,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -3641,7 +3643,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3650,23 +3652,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -3677,7 +3679,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ConstantDef_value_get (const TAO_ServerRequestInfo_CORBA_ConstantDef_value_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ConstantDef_value_get &); - + private: POA_CORBA_ConstantDef *_tao_impl; CORBA::Any * _result; @@ -3701,7 +3703,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -3713,11 +3715,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3726,11 +3728,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -3752,7 +3754,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Any * result) { // Update the result. @@ -3767,7 +3769,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl , const CORBA::Any & value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3776,37 +3778,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ConstantDef_value_set (const TAO_ServerRequestInfo_CORBA_ConstantDef_value_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ConstantDef_value_set &); - + private: POA_CORBA_ConstantDef *_tao_impl; const CORBA::Any & value_; - + }; TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_ConstantDef_value_set ( @@ -3829,16 +3831,16 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= value_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -3850,11 +3852,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3863,7 +3865,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -3902,14 +3904,14 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::_TAO_CORBA_ConstantDef_Strategi { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::~_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_ConstantDef_Proxy_Impl& @@ -3919,26 +3921,27 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -3951,7 +3954,7 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -3961,9 +3964,9 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -3983,13 +3986,13 @@ _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_Initializer)); @@ -4190,37 +4193,37 @@ void POA_CORBA_ConstantDef::_get_type_skel ( { POA_CORBA_ConstantDef *_tao_impl = ACE_static_cast (POA_CORBA_ConstantDef *, _tao_object_reference); - + CORBA::TypeCode_var _tao_retval; #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_CORBA_ConstantDef_type_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4237,11 +4240,11 @@ void POA_CORBA_ConstantDef::_get_type_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -4249,11 +4252,11 @@ void POA_CORBA_ConstantDef::_get_type_skel ( 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 ()) )) @@ -4261,7 +4264,7 @@ void POA_CORBA_ConstantDef::_get_type_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -4275,37 +4278,37 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( { POA_CORBA_ConstantDef *_tao_impl = ACE_static_cast (POA_CORBA_ConstantDef *, _tao_object_reference); - + CORBA_IDLType_var _tao_retval; #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_CORBA_ConstantDef_type_def_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4322,11 +4325,11 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -4334,11 +4337,11 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( 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 ()) )) @@ -4346,7 +4349,7 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -4361,7 +4364,7 @@ void POA_CORBA_ConstantDef::_set_type_def_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ConstantDef *_tao_impl = ACE_static_cast (POA_CORBA_ConstantDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_IDLType_var type_def; if (!( @@ -4373,12 +4376,12 @@ void POA_CORBA_ConstantDef::_set_type_def_skel ( #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_CORBA_ConstantDef_type_def_set ri ( _tao_server_request, _tao_upcall, @@ -4386,20 +4389,20 @@ void POA_CORBA_ConstantDef::_set_type_def_skel ( type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->type_def ( type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -4413,11 +4416,11 @@ void POA_CORBA_ConstantDef::_set_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -4425,12 +4428,12 @@ void POA_CORBA_ConstantDef::_set_type_def_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -4444,37 +4447,37 @@ void POA_CORBA_ConstantDef::_get_value_skel ( { POA_CORBA_ConstantDef *_tao_impl = ACE_static_cast (POA_CORBA_ConstantDef *, _tao_object_reference); - + CORBA::Any_var _tao_retval; #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_CORBA_ConstantDef_value_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->value ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Any * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4491,11 +4494,11 @@ void POA_CORBA_ConstantDef::_get_value_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -4503,11 +4506,11 @@ void POA_CORBA_ConstantDef::_get_value_skel ( 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 ()) )) @@ -4515,7 +4518,7 @@ void POA_CORBA_ConstantDef::_get_value_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -4530,7 +4533,7 @@ void POA_CORBA_ConstantDef::_set_value_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ConstantDef *_tao_impl = ACE_static_cast (POA_CORBA_ConstantDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::Any value; if (!( @@ -4542,12 +4545,12 @@ void POA_CORBA_ConstantDef::_set_value_skel ( #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_CORBA_ConstantDef_value_set ri ( _tao_server_request, _tao_upcall, @@ -4555,20 +4558,20 @@ void POA_CORBA_ConstantDef::_set_value_skel ( value, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->value ( value, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -4582,11 +4585,11 @@ void POA_CORBA_ConstantDef::_set_value_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -4594,18 +4597,18 @@ void POA_CORBA_ConstantDef::_set_value_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_ConstantDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4617,10 +4620,10 @@ void POA_CORBA_ConstantDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -4628,7 +4631,7 @@ void POA_CORBA_ConstantDef::_is_a_skel ( } void POA_CORBA_ConstantDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4637,7 +4640,7 @@ void POA_CORBA_ConstantDef::_non_existent_skel ( POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -4645,7 +4648,7 @@ void POA_CORBA_ConstantDef::_non_existent_skel ( } void POA_CORBA_ConstantDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4654,26 +4657,26 @@ void POA_CORBA_ConstantDef::_interface_skel ( POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -4685,7 +4688,7 @@ void POA_CORBA_ConstantDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -4699,7 +4702,7 @@ CORBA::Boolean POA_CORBA_ConstantDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -4744,20 +4747,20 @@ POA_CORBA_ConstantDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_ConstantDef::_unchecked_narrow (obj.in ()); } @@ -4841,50 +4844,50 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int { {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA_StructDef::_is_a_skel}, - {"lookup", &POA_CORBA_StructDef::lookup_skel}, - {"_get_name", &POA_CORBA_StructDef::_get_name_skel}, - {"_get_type", &POA_CORBA_StructDef::_get_type_skel}, - {"_set_name", &POA_CORBA_StructDef::_set_name_skel}, + {"lookup", &POA_CORBA_StructDef::lookup_skel}, + {"_get_name", &POA_CORBA_StructDef::_get_name_skel}, + {"_get_type", &POA_CORBA_StructDef::_get_type_skel}, + {"_set_name", &POA_CORBA_StructDef::_set_name_skel}, {"_interface", &POA_CORBA_StructDef::_interface_skel}, - {"lookup_name", &POA_CORBA_StructDef::lookup_name_skel}, - {"_get_id", &POA_CORBA_StructDef::_get_id_skel}, - {"_set_id", &POA_CORBA_StructDef::_set_id_skel}, - {"describe", &POA_CORBA_StructDef::describe_skel}, - {"_get_version", &POA_CORBA_StructDef::_get_version_skel}, - {"_set_version", &POA_CORBA_StructDef::_set_version_skel}, - {"_get_absolute_name", &POA_CORBA_StructDef::_get_absolute_name_skel}, - {"move", &POA_CORBA_StructDef::move_skel}, - {"_get_defined_in", &POA_CORBA_StructDef::_get_defined_in_skel}, - {"_get_def_kind", &POA_CORBA_StructDef::_get_def_kind_skel}, - {"destroy", &POA_CORBA_StructDef::destroy_skel}, - {"_get_members", &POA_CORBA_StructDef::_get_members_skel}, - {"_set_members", &POA_CORBA_StructDef::_set_members_skel}, + {"lookup_name", &POA_CORBA_StructDef::lookup_name_skel}, + {"_get_id", &POA_CORBA_StructDef::_get_id_skel}, + {"_set_id", &POA_CORBA_StructDef::_set_id_skel}, + {"describe", &POA_CORBA_StructDef::describe_skel}, + {"_get_version", &POA_CORBA_StructDef::_get_version_skel}, + {"_set_version", &POA_CORBA_StructDef::_set_version_skel}, + {"_get_absolute_name", &POA_CORBA_StructDef::_get_absolute_name_skel}, + {"move", &POA_CORBA_StructDef::move_skel}, + {"_get_defined_in", &POA_CORBA_StructDef::_get_defined_in_skel}, + {"_get_def_kind", &POA_CORBA_StructDef::_get_def_kind_skel}, + {"destroy", &POA_CORBA_StructDef::destroy_skel}, + {"_get_members", &POA_CORBA_StructDef::_get_members_skel}, + {"_set_members", &POA_CORBA_StructDef::_set_members_skel}, {"_non_existent", &POA_CORBA_StructDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_StructDef::_get_containing_repository_skel}, - {"create_value", &POA_CORBA_StructDef::create_value_skel}, - {"create_module", &POA_CORBA_StructDef::create_module_skel}, - {"create_native", &POA_CORBA_StructDef::create_native_skel}, - {"create_interface", &POA_CORBA_StructDef::create_interface_skel}, - {"create_union", &POA_CORBA_StructDef::create_union_skel}, - {"describe_contents", &POA_CORBA_StructDef::describe_contents_skel}, - {"create_exception", &POA_CORBA_StructDef::create_exception_skel}, - {"create_local_interface", &POA_CORBA_StructDef::create_local_interface_skel}, - {"create_abstract_interface", &POA_CORBA_StructDef::create_abstract_interface_skel}, - {"create_enum", &POA_CORBA_StructDef::create_enum_skel}, - {"contents", &POA_CORBA_StructDef::contents_skel}, - {"create_value_box", &POA_CORBA_StructDef::create_value_box_skel}, - {"create_alias", &POA_CORBA_StructDef::create_alias_skel}, - {"create_struct", &POA_CORBA_StructDef::create_struct_skel}, - {"create_constant", &POA_CORBA_StructDef::create_constant_skel}, + {"_get_containing_repository", &POA_CORBA_StructDef::_get_containing_repository_skel}, + {"create_value", &POA_CORBA_StructDef::create_value_skel}, + {"create_module", &POA_CORBA_StructDef::create_module_skel}, + {"create_native", &POA_CORBA_StructDef::create_native_skel}, + {"create_interface", &POA_CORBA_StructDef::create_interface_skel}, + {"create_union", &POA_CORBA_StructDef::create_union_skel}, + {"describe_contents", &POA_CORBA_StructDef::describe_contents_skel}, + {"create_exception", &POA_CORBA_StructDef::create_exception_skel}, + {"create_local_interface", &POA_CORBA_StructDef::create_local_interface_skel}, + {"create_abstract_interface", &POA_CORBA_StructDef::create_abstract_interface_skel}, + {"create_enum", &POA_CORBA_StructDef::create_enum_skel}, + {"contents", &POA_CORBA_StructDef::contents_skel}, + {"create_value_box", &POA_CORBA_StructDef::create_value_box_skel}, + {"create_alias", &POA_CORBA_StructDef::create_alias_skel}, + {"create_struct", &POA_CORBA_StructDef::create_struct_skel}, + {"create_constant", &POA_CORBA_StructDef::create_constant_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -7, -3, 5, 6, -12, -2, -66, 10, 11, -1, -15, - -2, -68, 14, -64, 17, 18, 19, 20, -1, -1, -1, 21, -1, -1, - -1, -1, -22, -2, -62, 24, -27, -2, 25, 26, -64, -1, -1, 29, - 30, -1, -1, 31, 32, 33, -1, -1, 34, 35, -1, 36, -1, -1, - 37, 38, 39, -1, 40, + -1, -1, -1, -7, -3, 5, 6, -12, -2, -66, 10, 11, -1, -15, + -2, -68, 14, -64, 17, 18, 19, 20, -1, -1, -1, 21, -1, -1, + -1, -1, -22, -2, -62, 24, -27, -2, 25, 26, -64, -1, -1, 29, + 30, -1, -1, 31, 32, 33, -1, -1, 34, 35, -1, 36, -1, -1, + 37, 38, 39, -1, 40, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -4929,7 +4932,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4938,23 +4941,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4965,7 +4968,7 @@ public: private: TAO_ServerRequestInfo_CORBA_StructDef_members_get (const TAO_ServerRequestInfo_CORBA_StructDef_members_get &); void operator= (const TAO_ServerRequestInfo_CORBA_StructDef_members_get &); - + private: POA_CORBA_StructDef *_tao_impl; CORBA_StructMemberSeq * _result; @@ -4989,7 +4992,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -5001,11 +5004,11 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5014,11 +5017,11 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5040,7 +5043,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (CORBA_StructMemberSeq * result) { // Update the result. @@ -5055,7 +5058,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl , const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5064,37 +5067,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_StructDef_members_set (const TAO_ServerRequestInfo_CORBA_StructDef_members_set &); void operator= (const TAO_ServerRequestInfo_CORBA_StructDef_members_set &); - + private: POA_CORBA_StructDef *_tao_impl; const CORBA_StructMemberSeq & members_; - + }; TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_StructDef_members_set ( @@ -5117,16 +5120,16 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->members_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5138,11 +5141,11 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5151,7 +5154,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -5190,14 +5193,14 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::_TAO_CORBA_StructDef_Strategized_ { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_StructDef_Strategized_Proxy_Broker::~_TAO_CORBA_StructDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_StructDef_Proxy_Impl& @@ -5207,26 +5210,27 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_StructDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -5239,7 +5243,7 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -5249,9 +5253,9 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -5271,13 +5275,13 @@ _TAO_CORBA_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_StructDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_StructDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_StructDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_StructDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_StructDef_Proxy_Broker_Factory_Initializer)); @@ -5387,37 +5391,37 @@ void POA_CORBA_StructDef::_get_members_skel ( { POA_CORBA_StructDef *_tao_impl = ACE_static_cast (POA_CORBA_StructDef *, _tao_object_reference); - + CORBA_StructMemberSeq_var _tao_retval; #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_CORBA_StructDef_members_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->members ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_StructMemberSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -5434,11 +5438,11 @@ void POA_CORBA_StructDef::_get_members_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -5446,11 +5450,11 @@ void POA_CORBA_StructDef::_get_members_skel ( 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 ()) )) @@ -5458,7 +5462,7 @@ void POA_CORBA_StructDef::_get_members_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -5473,7 +5477,7 @@ void POA_CORBA_StructDef::_set_members_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_StructDef *_tao_impl = ACE_static_cast (POA_CORBA_StructDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_StructMemberSeq members; if (!( @@ -5485,12 +5489,12 @@ void POA_CORBA_StructDef::_set_members_skel ( #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_CORBA_StructDef_members_set ri ( _tao_server_request, _tao_upcall, @@ -5498,20 +5502,20 @@ void POA_CORBA_StructDef::_set_members_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->members ( members, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -5525,11 +5529,11 @@ void POA_CORBA_StructDef::_set_members_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -5537,18 +5541,18 @@ void POA_CORBA_StructDef::_set_members_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_StructDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -5560,10 +5564,10 @@ void POA_CORBA_StructDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -5571,7 +5575,7 @@ void POA_CORBA_StructDef::_is_a_skel ( } void POA_CORBA_StructDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -5580,7 +5584,7 @@ void POA_CORBA_StructDef::_non_existent_skel ( POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -5588,7 +5592,7 @@ void POA_CORBA_StructDef::_non_existent_skel ( } void POA_CORBA_StructDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -5597,26 +5601,26 @@ void POA_CORBA_StructDef::_interface_skel ( POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -5628,7 +5632,7 @@ void POA_CORBA_StructDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -5642,7 +5646,7 @@ CORBA::Boolean POA_CORBA_StructDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || @@ -5696,20 +5700,20 @@ POA_CORBA_StructDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_StructDef::_unchecked_narrow (obj.in ()); } @@ -5793,53 +5797,53 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l { {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA_UnionDef::_is_a_skel}, - {"lookup", &POA_CORBA_UnionDef::lookup_skel}, - {"_get_name", &POA_CORBA_UnionDef::_get_name_skel}, - {"_get_type", &POA_CORBA_UnionDef::_get_type_skel}, - {"_set_name", &POA_CORBA_UnionDef::_set_name_skel}, + {"lookup", &POA_CORBA_UnionDef::lookup_skel}, + {"_get_name", &POA_CORBA_UnionDef::_get_name_skel}, + {"_get_type", &POA_CORBA_UnionDef::_get_type_skel}, + {"_set_name", &POA_CORBA_UnionDef::_set_name_skel}, {"_interface", &POA_CORBA_UnionDef::_interface_skel}, - {"lookup_name", &POA_CORBA_UnionDef::lookup_name_skel}, - {"_get_id", &POA_CORBA_UnionDef::_get_id_skel}, - {"_set_id", &POA_CORBA_UnionDef::_set_id_skel}, - {"describe", &POA_CORBA_UnionDef::describe_skel}, - {"_get_version", &POA_CORBA_UnionDef::_get_version_skel}, - {"_set_version", &POA_CORBA_UnionDef::_set_version_skel}, - {"_get_absolute_name", &POA_CORBA_UnionDef::_get_absolute_name_skel}, - {"move", &POA_CORBA_UnionDef::move_skel}, - {"_get_defined_in", &POA_CORBA_UnionDef::_get_defined_in_skel}, - {"_get_def_kind", &POA_CORBA_UnionDef::_get_def_kind_skel}, - {"_get_discriminator_type", &POA_CORBA_UnionDef::_get_discriminator_type_skel}, - {"destroy", &POA_CORBA_UnionDef::destroy_skel}, - {"_get_discriminator_type_def", &POA_CORBA_UnionDef::_get_discriminator_type_def_skel}, - {"_set_discriminator_type_def", &POA_CORBA_UnionDef::_set_discriminator_type_def_skel}, - {"_get_members", &POA_CORBA_UnionDef::_get_members_skel}, - {"_set_members", &POA_CORBA_UnionDef::_set_members_skel}, + {"lookup_name", &POA_CORBA_UnionDef::lookup_name_skel}, + {"_get_id", &POA_CORBA_UnionDef::_get_id_skel}, + {"_set_id", &POA_CORBA_UnionDef::_set_id_skel}, + {"describe", &POA_CORBA_UnionDef::describe_skel}, + {"_get_version", &POA_CORBA_UnionDef::_get_version_skel}, + {"_set_version", &POA_CORBA_UnionDef::_set_version_skel}, + {"_get_absolute_name", &POA_CORBA_UnionDef::_get_absolute_name_skel}, + {"move", &POA_CORBA_UnionDef::move_skel}, + {"_get_defined_in", &POA_CORBA_UnionDef::_get_defined_in_skel}, + {"_get_def_kind", &POA_CORBA_UnionDef::_get_def_kind_skel}, + {"_get_discriminator_type", &POA_CORBA_UnionDef::_get_discriminator_type_skel}, + {"destroy", &POA_CORBA_UnionDef::destroy_skel}, + {"_get_discriminator_type_def", &POA_CORBA_UnionDef::_get_discriminator_type_def_skel}, + {"_set_discriminator_type_def", &POA_CORBA_UnionDef::_set_discriminator_type_def_skel}, + {"_get_members", &POA_CORBA_UnionDef::_get_members_skel}, + {"_set_members", &POA_CORBA_UnionDef::_set_members_skel}, {"_non_existent", &POA_CORBA_UnionDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_UnionDef::_get_containing_repository_skel}, - {"create_value", &POA_CORBA_UnionDef::create_value_skel}, - {"create_module", &POA_CORBA_UnionDef::create_module_skel}, - {"create_native", &POA_CORBA_UnionDef::create_native_skel}, - {"create_interface", &POA_CORBA_UnionDef::create_interface_skel}, - {"create_union", &POA_CORBA_UnionDef::create_union_skel}, - {"describe_contents", &POA_CORBA_UnionDef::describe_contents_skel}, - {"create_exception", &POA_CORBA_UnionDef::create_exception_skel}, - {"create_local_interface", &POA_CORBA_UnionDef::create_local_interface_skel}, - {"create_abstract_interface", &POA_CORBA_UnionDef::create_abstract_interface_skel}, - {"create_enum", &POA_CORBA_UnionDef::create_enum_skel}, - {"contents", &POA_CORBA_UnionDef::contents_skel}, - {"create_value_box", &POA_CORBA_UnionDef::create_value_box_skel}, - {"create_alias", &POA_CORBA_UnionDef::create_alias_skel}, - {"create_struct", &POA_CORBA_UnionDef::create_struct_skel}, - {"create_constant", &POA_CORBA_UnionDef::create_constant_skel}, + {"_get_containing_repository", &POA_CORBA_UnionDef::_get_containing_repository_skel}, + {"create_value", &POA_CORBA_UnionDef::create_value_skel}, + {"create_module", &POA_CORBA_UnionDef::create_module_skel}, + {"create_native", &POA_CORBA_UnionDef::create_native_skel}, + {"create_interface", &POA_CORBA_UnionDef::create_interface_skel}, + {"create_union", &POA_CORBA_UnionDef::create_union_skel}, + {"describe_contents", &POA_CORBA_UnionDef::describe_contents_skel}, + {"create_exception", &POA_CORBA_UnionDef::create_exception_skel}, + {"create_local_interface", &POA_CORBA_UnionDef::create_local_interface_skel}, + {"create_abstract_interface", &POA_CORBA_UnionDef::create_abstract_interface_skel}, + {"create_enum", &POA_CORBA_UnionDef::create_enum_skel}, + {"contents", &POA_CORBA_UnionDef::contents_skel}, + {"create_value_box", &POA_CORBA_UnionDef::create_value_box_skel}, + {"create_alias", &POA_CORBA_UnionDef::create_alias_skel}, + {"create_struct", &POA_CORBA_UnionDef::create_struct_skel}, + {"create_constant", &POA_CORBA_UnionDef::create_constant_skel}, }; static const signed char lookup[] = { - -1, -7, -3, -12, -2, 5, 6, -15, -2, -68, 10, 11, -1, -23, - -2, -72, 14, -70, 17, 18, 19, 20, -1, 21, -1, 22, -1, -74, - -1, -1, -25, -2, -62, 27, -30, -2, 28, 29, -64, -1, -1, 32, - 33, -1, -1, 34, 35, 36, -1, -1, 37, 38, -1, 39, -1, -1, - 40, 41, 42, -1, 43, + -1, -7, -3, -12, -2, 5, 6, -15, -2, -68, 10, 11, -1, -23, + -2, -72, 14, -70, 17, 18, 19, 20, -1, 21, -1, 22, -1, -74, + -1, -1, -25, -2, -62, 27, -30, -2, 28, 29, -64, -1, -1, 32, + 33, -1, -1, 34, 35, 36, -1, -1, 37, 38, -1, 39, -1, -1, + 40, 41, 42, -1, 43, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -5884,7 +5888,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5893,23 +5897,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5920,7 +5924,7 @@ public: private: TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get (const TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get &); void operator= (const TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get &); - + private: POA_CORBA_UnionDef *_tao_impl; CORBA::TypeCode_ptr _result; @@ -5944,7 +5948,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (CORBA::E Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -5956,11 +5960,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (CORBA:: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5969,11 +5973,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Envi CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5995,7 +5999,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -6009,7 +6013,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6018,23 +6022,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6045,7 +6049,7 @@ public: private: TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (const TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get &); void operator= (const TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get &); - + private: POA_CORBA_UnionDef *_tao_impl; CORBA_IDLType_ptr _result; @@ -6069,7 +6073,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -6081,11 +6085,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6094,11 +6098,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6120,7 +6124,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA_IDLType_ptr result) { // Update the result. @@ -6135,7 +6139,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl , CORBA_IDLType_ptr discriminator_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6144,37 +6148,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set (const TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set &); void operator= (const TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set &); - + private: POA_CORBA_UnionDef *_tao_impl; CORBA_IDLType_ptr discriminator_type_def_; - + }; TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set ( @@ -6197,16 +6201,16 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->discriminator_type_def_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6218,11 +6222,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6231,7 +6235,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -6260,7 +6264,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6269,23 +6273,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6296,7 +6300,7 @@ public: private: TAO_ServerRequestInfo_CORBA_UnionDef_members_get (const TAO_ServerRequestInfo_CORBA_UnionDef_members_get &); void operator= (const TAO_ServerRequestInfo_CORBA_UnionDef_members_get &); - + private: POA_CORBA_UnionDef *_tao_impl; CORBA_UnionMemberSeq * _result; @@ -6320,7 +6324,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -6332,11 +6336,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6345,11 +6349,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (CORBA::Environment &AC CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6371,7 +6375,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (CORBA_UnionMemberSeq * result) { // Update the result. @@ -6386,7 +6390,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl , const CORBA_UnionMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6395,37 +6399,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_UnionDef_members_set (const TAO_ServerRequestInfo_CORBA_UnionDef_members_set &); void operator= (const TAO_ServerRequestInfo_CORBA_UnionDef_members_set &); - + private: POA_CORBA_UnionDef *_tao_impl; const CORBA_UnionMemberSeq & members_; - + }; TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_UnionDef_members_set ( @@ -6448,16 +6452,16 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->members_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6469,11 +6473,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6482,7 +6486,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (CORBA::Environment &AC CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -6521,14 +6525,14 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::_TAO_CORBA_UnionDef_Strategized_Pr { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::~_TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_UnionDef_Proxy_Impl& @@ -6538,26 +6542,27 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -6570,7 +6575,7 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -6580,9 +6585,9 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -6602,13 +6607,13 @@ _TAO_CORBA_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_UnionDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_UnionDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_UnionDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_UnionDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_UnionDef_Proxy_Broker_Factory_Initializer)); @@ -6812,37 +6817,37 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( { POA_CORBA_UnionDef *_tao_impl = ACE_static_cast (POA_CORBA_UnionDef *, _tao_object_reference); - + CORBA::TypeCode_var _tao_retval; #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_CORBA_UnionDef_discriminator_type_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->discriminator_type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -6859,11 +6864,11 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -6871,11 +6876,11 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( 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 ()) )) @@ -6883,7 +6888,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -6897,37 +6902,37 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( { POA_CORBA_UnionDef *_tao_impl = ACE_static_cast (POA_CORBA_UnionDef *, _tao_object_reference); - + CORBA_IDLType_var _tao_retval; #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_CORBA_UnionDef_discriminator_type_def_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->discriminator_type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -6944,11 +6949,11 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -6956,11 +6961,11 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( 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 ()) )) @@ -6968,7 +6973,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -6983,7 +6988,7 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_UnionDef *_tao_impl = ACE_static_cast (POA_CORBA_UnionDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_IDLType_var discriminator_type_def; if (!( @@ -6995,12 +7000,12 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel ( #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_CORBA_UnionDef_discriminator_type_def_set ri ( _tao_server_request, _tao_upcall, @@ -7008,20 +7013,20 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel ( discriminator_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->discriminator_type_def ( discriminator_type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -7035,11 +7040,11 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7047,12 +7052,12 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7066,37 +7071,37 @@ void POA_CORBA_UnionDef::_get_members_skel ( { POA_CORBA_UnionDef *_tao_impl = ACE_static_cast (POA_CORBA_UnionDef *, _tao_object_reference); - + CORBA_UnionMemberSeq_var _tao_retval; #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_CORBA_UnionDef_members_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->members ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_UnionMemberSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -7113,11 +7118,11 @@ void POA_CORBA_UnionDef::_get_members_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7125,11 +7130,11 @@ void POA_CORBA_UnionDef::_get_members_skel ( 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 ()) )) @@ -7137,7 +7142,7 @@ void POA_CORBA_UnionDef::_get_members_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7152,7 +7157,7 @@ void POA_CORBA_UnionDef::_set_members_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_UnionDef *_tao_impl = ACE_static_cast (POA_CORBA_UnionDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_UnionMemberSeq members; if (!( @@ -7164,12 +7169,12 @@ void POA_CORBA_UnionDef::_set_members_skel ( #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_CORBA_UnionDef_members_set ri ( _tao_server_request, _tao_upcall, @@ -7177,20 +7182,20 @@ void POA_CORBA_UnionDef::_set_members_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->members ( members, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -7204,11 +7209,11 @@ void POA_CORBA_UnionDef::_set_members_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7216,18 +7221,18 @@ void POA_CORBA_UnionDef::_set_members_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_UnionDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -7239,10 +7244,10 @@ void POA_CORBA_UnionDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -7250,7 +7255,7 @@ void POA_CORBA_UnionDef::_is_a_skel ( } void POA_CORBA_UnionDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -7259,7 +7264,7 @@ void POA_CORBA_UnionDef::_non_existent_skel ( POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -7267,7 +7272,7 @@ void POA_CORBA_UnionDef::_non_existent_skel ( } void POA_CORBA_UnionDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -7276,26 +7281,26 @@ void POA_CORBA_UnionDef::_interface_skel ( POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -7307,7 +7312,7 @@ void POA_CORBA_UnionDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -7321,7 +7326,7 @@ CORBA::Boolean POA_CORBA_UnionDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || @@ -7375,20 +7380,20 @@ POA_CORBA_UnionDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_UnionDef::_unchecked_narrow (obj.in ()); } @@ -7471,32 +7476,32 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_EnumDef::move_skel}, + {"move", &POA_CORBA_EnumDef::move_skel}, {"_is_a", &POA_CORBA_EnumDef::_is_a_skel}, - {"_get_id", &POA_CORBA_EnumDef::_get_id_skel}, - {"_set_id", &POA_CORBA_EnumDef::_set_id_skel}, - {"describe", &POA_CORBA_EnumDef::describe_skel}, - {"_get_name", &POA_CORBA_EnumDef::_get_name_skel}, - {"_get_type", &POA_CORBA_EnumDef::_get_type_skel}, - {"_set_name", &POA_CORBA_EnumDef::_set_name_skel}, + {"_get_id", &POA_CORBA_EnumDef::_get_id_skel}, + {"_set_id", &POA_CORBA_EnumDef::_set_id_skel}, + {"describe", &POA_CORBA_EnumDef::describe_skel}, + {"_get_name", &POA_CORBA_EnumDef::_get_name_skel}, + {"_get_type", &POA_CORBA_EnumDef::_get_type_skel}, + {"_set_name", &POA_CORBA_EnumDef::_set_name_skel}, {"_interface", &POA_CORBA_EnumDef::_interface_skel}, - {"_get_version", &POA_CORBA_EnumDef::_get_version_skel}, - {"_set_version", &POA_CORBA_EnumDef::_set_version_skel}, - {"_get_def_kind", &POA_CORBA_EnumDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_CORBA_EnumDef::_get_defined_in_skel}, - {"destroy", &POA_CORBA_EnumDef::destroy_skel}, - {"_get_absolute_name", &POA_CORBA_EnumDef::_get_absolute_name_skel}, - {"_get_members", &POA_CORBA_EnumDef::_get_members_skel}, - {"_set_members", &POA_CORBA_EnumDef::_set_members_skel}, + {"_get_version", &POA_CORBA_EnumDef::_get_version_skel}, + {"_set_version", &POA_CORBA_EnumDef::_set_version_skel}, + {"_get_def_kind", &POA_CORBA_EnumDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_CORBA_EnumDef::_get_defined_in_skel}, + {"destroy", &POA_CORBA_EnumDef::destroy_skel}, + {"_get_absolute_name", &POA_CORBA_EnumDef::_get_absolute_name_skel}, + {"_get_members", &POA_CORBA_EnumDef::_get_members_skel}, + {"_set_members", &POA_CORBA_EnumDef::_set_members_skel}, {"_non_existent", &POA_CORBA_EnumDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_EnumDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_CORBA_EnumDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -3, -13, -2, 4, 5, -1, 53, 8, -45, 12, -1, -46, 15, - -1, 16, -1, 17, 18, -1, -19, -2, -38, 21, -6, -2, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 22, + -9, -3, -13, -2, 4, 5, -1, 53, 8, -45, 12, -1, -46, 15, + -1, 16, -1, 17, 18, -1, -19, -2, -38, 21, -6, -2, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 22, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -7541,7 +7546,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -7550,23 +7555,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -7577,7 +7582,7 @@ public: private: TAO_ServerRequestInfo_CORBA_EnumDef_members_get (const TAO_ServerRequestInfo_CORBA_EnumDef_members_get &); void operator= (const TAO_ServerRequestInfo_CORBA_EnumDef_members_get &); - + private: POA_CORBA_EnumDef *_tao_impl; CORBA_EnumMemberSeq * _result; @@ -7601,7 +7606,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (CORBA::Environment & Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -7613,11 +7618,11 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -7626,11 +7631,11 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (CORBA::Environment &ACE CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -7652,7 +7657,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (CORBA_EnumMemberSeq * result) { // Update the result. @@ -7667,7 +7672,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl , const CORBA_EnumMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -7676,37 +7681,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_EnumDef_members_set (const TAO_ServerRequestInfo_CORBA_EnumDef_members_set &); void operator= (const TAO_ServerRequestInfo_CORBA_EnumDef_members_set &); - + private: POA_CORBA_EnumDef *_tao_impl; const CORBA_EnumMemberSeq & members_; - + }; TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_EnumDef_members_set ( @@ -7729,16 +7734,16 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (CORBA::Environment & Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->members_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -7750,11 +7755,11 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -7763,7 +7768,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (CORBA::Environment &ACE CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -7802,14 +7807,14 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::_TAO_CORBA_EnumDef_Strategized_Prox { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::~_TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_EnumDef_Proxy_Impl& @@ -7819,26 +7824,27 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -7851,7 +7857,7 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -7861,9 +7867,9 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -7883,13 +7889,13 @@ _TAO_CORBA_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_EnumDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_EnumDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_EnumDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_EnumDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_EnumDef_Proxy_Broker_Factory_Initializer)); @@ -7998,37 +8004,37 @@ void POA_CORBA_EnumDef::_get_members_skel ( { POA_CORBA_EnumDef *_tao_impl = ACE_static_cast (POA_CORBA_EnumDef *, _tao_object_reference); - + CORBA_EnumMemberSeq_var _tao_retval; #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_CORBA_EnumDef_members_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->members ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_EnumMemberSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8045,11 +8051,11 @@ void POA_CORBA_EnumDef::_get_members_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8057,11 +8063,11 @@ void POA_CORBA_EnumDef::_get_members_skel ( 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 ()) )) @@ -8069,7 +8075,7 @@ void POA_CORBA_EnumDef::_get_members_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8084,7 +8090,7 @@ void POA_CORBA_EnumDef::_set_members_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_EnumDef *_tao_impl = ACE_static_cast (POA_CORBA_EnumDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_EnumMemberSeq members; if (!( @@ -8096,12 +8102,12 @@ void POA_CORBA_EnumDef::_set_members_skel ( #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_CORBA_EnumDef_members_set ri ( _tao_server_request, _tao_upcall, @@ -8109,20 +8115,20 @@ void POA_CORBA_EnumDef::_set_members_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->members ( members, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -8136,11 +8142,11 @@ void POA_CORBA_EnumDef::_set_members_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8148,18 +8154,18 @@ void POA_CORBA_EnumDef::_set_members_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_EnumDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -8171,10 +8177,10 @@ void POA_CORBA_EnumDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -8182,7 +8188,7 @@ void POA_CORBA_EnumDef::_is_a_skel ( } void POA_CORBA_EnumDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -8191,7 +8197,7 @@ void POA_CORBA_EnumDef::_non_existent_skel ( POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -8199,7 +8205,7 @@ void POA_CORBA_EnumDef::_non_existent_skel ( } void POA_CORBA_EnumDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -8208,26 +8214,26 @@ void POA_CORBA_EnumDef::_interface_skel ( POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -8239,7 +8245,7 @@ void POA_CORBA_EnumDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -8253,7 +8259,7 @@ CORBA::Boolean POA_CORBA_EnumDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || @@ -8304,20 +8310,20 @@ POA_CORBA_EnumDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_EnumDef::_unchecked_narrow (obj.in ()); } @@ -8400,32 +8406,32 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_AliasDef::move_skel}, + {"move", &POA_CORBA_AliasDef::move_skel}, {"_is_a", &POA_CORBA_AliasDef::_is_a_skel}, - {"_get_id", &POA_CORBA_AliasDef::_get_id_skel}, - {"_set_id", &POA_CORBA_AliasDef::_set_id_skel}, - {"describe", &POA_CORBA_AliasDef::describe_skel}, - {"_get_name", &POA_CORBA_AliasDef::_get_name_skel}, - {"_get_type", &POA_CORBA_AliasDef::_get_type_skel}, - {"_set_name", &POA_CORBA_AliasDef::_set_name_skel}, + {"_get_id", &POA_CORBA_AliasDef::_get_id_skel}, + {"_set_id", &POA_CORBA_AliasDef::_set_id_skel}, + {"describe", &POA_CORBA_AliasDef::describe_skel}, + {"_get_name", &POA_CORBA_AliasDef::_get_name_skel}, + {"_get_type", &POA_CORBA_AliasDef::_get_type_skel}, + {"_set_name", &POA_CORBA_AliasDef::_set_name_skel}, {"_interface", &POA_CORBA_AliasDef::_interface_skel}, - {"_get_version", &POA_CORBA_AliasDef::_get_version_skel}, - {"_set_version", &POA_CORBA_AliasDef::_set_version_skel}, - {"_get_def_kind", &POA_CORBA_AliasDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_CORBA_AliasDef::_get_defined_in_skel}, - {"destroy", &POA_CORBA_AliasDef::destroy_skel}, - {"_get_absolute_name", &POA_CORBA_AliasDef::_get_absolute_name_skel}, - {"_get_original_type_def", &POA_CORBA_AliasDef::_get_original_type_def_skel}, - {"_set_original_type_def", &POA_CORBA_AliasDef::_set_original_type_def_skel}, + {"_get_version", &POA_CORBA_AliasDef::_get_version_skel}, + {"_set_version", &POA_CORBA_AliasDef::_set_version_skel}, + {"_get_def_kind", &POA_CORBA_AliasDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_CORBA_AliasDef::_get_defined_in_skel}, + {"destroy", &POA_CORBA_AliasDef::destroy_skel}, + {"_get_absolute_name", &POA_CORBA_AliasDef::_get_absolute_name_skel}, + {"_get_original_type_def", &POA_CORBA_AliasDef::_get_original_type_def_skel}, + {"_set_original_type_def", &POA_CORBA_AliasDef::_set_original_type_def_skel}, {"_non_existent", &POA_CORBA_AliasDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_AliasDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_CORBA_AliasDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -3, -13, -2, 4, 5, -1, 53, 8, -45, 12, -1, -46, 15, - -1, 16, -1, 17, 18, -1, -19, -2, -38, 21, -6, -2, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 22, + -9, -3, -13, -2, 4, 5, -1, 53, 8, -45, 12, -1, -46, 15, + -1, 16, -1, 17, 18, -1, -19, -2, -38, 21, -6, -2, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 22, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -8470,7 +8476,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -8479,23 +8485,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -8506,7 +8512,7 @@ public: private: TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (const TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get &); void operator= (const TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get &); - + private: POA_CORBA_AliasDef *_tao_impl; CORBA_IDLType_ptr _result; @@ -8530,7 +8536,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (CORBA::En Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -8542,11 +8548,11 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (CORBA::E Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -8555,11 +8561,11 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::Envir CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -8581,7 +8587,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA_IDLType_ptr result) { // Update the result. @@ -8596,7 +8602,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl , CORBA_IDLType_ptr original_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -8605,37 +8611,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set (const TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set &); void operator= (const TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set &); - + private: POA_CORBA_AliasDef *_tao_impl; CORBA_IDLType_ptr original_type_def_; - + }; TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set ( @@ -8658,16 +8664,16 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (CORBA::En Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->original_type_def_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -8679,11 +8685,11 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (CORBA::E Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -8692,7 +8698,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (CORBA::Envir CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -8731,14 +8737,14 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::_TAO_CORBA_AliasDef_Strategized_Pr { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::~_TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_AliasDef_Proxy_Impl& @@ -8748,26 +8754,27 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -8780,7 +8787,7 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -8790,9 +8797,9 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -8812,13 +8819,13 @@ _TAO_CORBA_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_AliasDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_AliasDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_AliasDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_AliasDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_AliasDef_Proxy_Broker_Factory_Initializer)); @@ -8927,37 +8934,37 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( { POA_CORBA_AliasDef *_tao_impl = ACE_static_cast (POA_CORBA_AliasDef *, _tao_object_reference); - + CORBA_IDLType_var _tao_retval; #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_CORBA_AliasDef_original_type_def_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->original_type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8974,11 +8981,11 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8986,11 +8993,11 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( 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 ()) )) @@ -8998,7 +9005,7 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -9013,7 +9020,7 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_AliasDef *_tao_impl = ACE_static_cast (POA_CORBA_AliasDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_IDLType_var original_type_def; if (!( @@ -9025,12 +9032,12 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel ( #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_CORBA_AliasDef_original_type_def_set ri ( _tao_server_request, _tao_upcall, @@ -9038,20 +9045,20 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel ( original_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->original_type_def ( original_type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -9065,11 +9072,11 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9077,18 +9084,18 @@ void POA_CORBA_AliasDef::_set_original_type_def_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_AliasDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9100,10 +9107,10 @@ void POA_CORBA_AliasDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -9111,7 +9118,7 @@ void POA_CORBA_AliasDef::_is_a_skel ( } void POA_CORBA_AliasDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9120,7 +9127,7 @@ void POA_CORBA_AliasDef::_non_existent_skel ( POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -9128,7 +9135,7 @@ void POA_CORBA_AliasDef::_non_existent_skel ( } void POA_CORBA_AliasDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9137,26 +9144,26 @@ void POA_CORBA_AliasDef::_interface_skel ( POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -9168,7 +9175,7 @@ void POA_CORBA_AliasDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -9182,7 +9189,7 @@ CORBA::Boolean POA_CORBA_AliasDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || @@ -9233,20 +9240,20 @@ POA_CORBA_AliasDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_AliasDef::_unchecked_narrow (obj.in ()); } @@ -9329,30 +9336,30 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_NativeDef::move_skel}, + {"move", &POA_CORBA_NativeDef::move_skel}, {"_is_a", &POA_CORBA_NativeDef::_is_a_skel}, - {"_get_id", &POA_CORBA_NativeDef::_get_id_skel}, - {"_set_id", &POA_CORBA_NativeDef::_set_id_skel}, - {"describe", &POA_CORBA_NativeDef::describe_skel}, - {"_get_name", &POA_CORBA_NativeDef::_get_name_skel}, - {"_get_type", &POA_CORBA_NativeDef::_get_type_skel}, - {"_set_name", &POA_CORBA_NativeDef::_set_name_skel}, + {"_get_id", &POA_CORBA_NativeDef::_get_id_skel}, + {"_set_id", &POA_CORBA_NativeDef::_set_id_skel}, + {"describe", &POA_CORBA_NativeDef::describe_skel}, + {"_get_name", &POA_CORBA_NativeDef::_get_name_skel}, + {"_get_type", &POA_CORBA_NativeDef::_get_type_skel}, + {"_set_name", &POA_CORBA_NativeDef::_set_name_skel}, {"_interface", &POA_CORBA_NativeDef::_interface_skel}, - {"_get_version", &POA_CORBA_NativeDef::_get_version_skel}, - {"_set_version", &POA_CORBA_NativeDef::_set_version_skel}, - {"_get_def_kind", &POA_CORBA_NativeDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_CORBA_NativeDef::_get_defined_in_skel}, - {"destroy", &POA_CORBA_NativeDef::destroy_skel}, - {"_get_absolute_name", &POA_CORBA_NativeDef::_get_absolute_name_skel}, + {"_get_version", &POA_CORBA_NativeDef::_get_version_skel}, + {"_set_version", &POA_CORBA_NativeDef::_set_version_skel}, + {"_get_def_kind", &POA_CORBA_NativeDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_CORBA_NativeDef::_get_defined_in_skel}, + {"destroy", &POA_CORBA_NativeDef::destroy_skel}, + {"_get_absolute_name", &POA_CORBA_NativeDef::_get_absolute_name_skel}, {"_non_existent", &POA_CORBA_NativeDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_NativeDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_CORBA_NativeDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -3, -13, -2, 4, 5, -1, 48, 8, -45, 12, -1, -46, 15, - -1, 16, -1, 17, 18, -6, -2, -1, -1, 19, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 20, + -9, -3, -13, -2, 4, 5, -1, 48, 8, -45, 12, -1, -46, 15, + -1, 16, -1, 17, 18, -6, -2, -1, -1, 19, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 20, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -9407,14 +9414,14 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::_TAO_CORBA_NativeDef_Strategized_ { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::~_TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_NativeDef_Proxy_Impl& @@ -9424,26 +9431,27 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -9456,7 +9464,7 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -9466,9 +9474,9 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -9488,13 +9496,13 @@ _TAO_CORBA_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_NativeDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_NativeDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_NativeDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_NativeDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_NativeDef_Proxy_Broker_Factory_Initializer)); @@ -9532,7 +9540,7 @@ POA_CORBA_NativeDef::~POA_CORBA_NativeDef (void) } void POA_CORBA_NativeDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9544,10 +9552,10 @@ void POA_CORBA_NativeDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -9555,7 +9563,7 @@ void POA_CORBA_NativeDef::_is_a_skel ( } void POA_CORBA_NativeDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9564,7 +9572,7 @@ void POA_CORBA_NativeDef::_non_existent_skel ( POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -9572,7 +9580,7 @@ void POA_CORBA_NativeDef::_non_existent_skel ( } void POA_CORBA_NativeDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9581,26 +9589,26 @@ void POA_CORBA_NativeDef::_interface_skel ( POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -9612,7 +9620,7 @@ void POA_CORBA_NativeDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -9626,7 +9634,7 @@ CORBA::Boolean POA_CORBA_NativeDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || @@ -9677,20 +9685,20 @@ POA_CORBA_NativeDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_NativeDef::_unchecked_narrow (obj.in ()); } @@ -9775,12 +9783,12 @@ TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA_PrimitiveDef::_is_a_skel}, {"",0}, - {"destroy", &POA_CORBA_PrimitiveDef::destroy_skel}, + {"destroy", &POA_CORBA_PrimitiveDef::destroy_skel}, {"",0}, - {"_get_kind", &POA_CORBA_PrimitiveDef::_get_kind_skel}, + {"_get_kind", &POA_CORBA_PrimitiveDef::_get_kind_skel}, {"",0},{"",0},{"",0}, - {"_get_def_kind", &POA_CORBA_PrimitiveDef::_get_def_kind_skel}, - {"_get_type", &POA_CORBA_PrimitiveDef::_get_type_skel}, + {"_get_def_kind", &POA_CORBA_PrimitiveDef::_get_def_kind_skel}, + {"_get_type", &POA_CORBA_PrimitiveDef::_get_type_skel}, {"_interface", &POA_CORBA_PrimitiveDef::_interface_skel}, {"",0},{"",0}, {"_non_existent", &POA_CORBA_PrimitiveDef::_non_existent_skel}, @@ -9811,7 +9819,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_PrimitiveDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -9820,23 +9828,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -9847,7 +9855,7 @@ public: private: TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get (const TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get &); void operator= (const TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get &); - + private: POA_CORBA_PrimitiveDef *_tao_impl; CORBA::PrimitiveKind _result; @@ -9871,7 +9879,7 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -9883,11 +9891,11 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9896,11 +9904,11 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9922,7 +9930,7 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::PrimitiveKind result) { // Update the result. @@ -9946,14 +9954,14 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::_TAO_CORBA_PrimitiveDef_Strate { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_PrimitiveDef_Proxy_Impl& @@ -9963,26 +9971,27 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -9995,7 +10004,7 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -10005,9 +10014,9 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -10027,13 +10036,13 @@ _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_Initializer)); @@ -10108,37 +10117,37 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( { POA_CORBA_PrimitiveDef *_tao_impl = ACE_static_cast (POA_CORBA_PrimitiveDef *, _tao_object_reference); - + CORBA::PrimitiveKind _tao_retval; #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_CORBA_PrimitiveDef_kind_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->kind ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::PrimitiveKind _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -10154,11 +10163,11 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -10166,11 +10175,11 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( 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) )) @@ -10178,13 +10187,13 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_PrimitiveDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10196,10 +10205,10 @@ void POA_CORBA_PrimitiveDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -10207,7 +10216,7 @@ void POA_CORBA_PrimitiveDef::_is_a_skel ( } void POA_CORBA_PrimitiveDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10216,7 +10225,7 @@ void POA_CORBA_PrimitiveDef::_non_existent_skel ( POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -10224,7 +10233,7 @@ void POA_CORBA_PrimitiveDef::_non_existent_skel ( } void POA_CORBA_PrimitiveDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10233,26 +10242,26 @@ void POA_CORBA_PrimitiveDef::_interface_skel ( POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -10264,7 +10273,7 @@ void POA_CORBA_PrimitiveDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -10278,7 +10287,7 @@ CORBA::Boolean POA_CORBA_PrimitiveDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -10323,20 +10332,20 @@ POA_CORBA_PrimitiveDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_PrimitiveDef::_unchecked_narrow (obj.in ()); } @@ -10420,19 +10429,19 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int { {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA_StringDef::_is_a_skel}, - {"destroy", &POA_CORBA_StringDef::destroy_skel}, - {"_get_bound", &POA_CORBA_StringDef::_get_bound_skel}, - {"_set_bound", &POA_CORBA_StringDef::_set_bound_skel}, - {"_get_def_kind", &POA_CORBA_StringDef::_get_def_kind_skel}, - {"_get_type", &POA_CORBA_StringDef::_get_type_skel}, + {"destroy", &POA_CORBA_StringDef::destroy_skel}, + {"_get_bound", &POA_CORBA_StringDef::_get_bound_skel}, + {"_set_bound", &POA_CORBA_StringDef::_set_bound_skel}, + {"_get_def_kind", &POA_CORBA_StringDef::_get_def_kind_skel}, + {"_get_type", &POA_CORBA_StringDef::_get_type_skel}, {"_interface", &POA_CORBA_StringDef::_interface_skel}, {"_non_existent", &POA_CORBA_StringDef::_non_existent_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, -1, 5, -1, 6, -7, -2, -20, -1, -1, 9, - 10, 11, -1, -1, 12, + -1, -1, -1, -1, -1, 5, -1, 6, -7, -2, -20, -1, -1, 9, + 10, 11, -1, -1, 12, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -10477,7 +10486,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -10486,23 +10495,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -10513,7 +10522,7 @@ public: private: TAO_ServerRequestInfo_CORBA_StringDef_bound_get (const TAO_ServerRequestInfo_CORBA_StringDef_bound_get &); void operator= (const TAO_ServerRequestInfo_CORBA_StringDef_bound_get &); - + private: POA_CORBA_StringDef *_tao_impl; CORBA::ULong _result; @@ -10537,7 +10546,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (CORBA::Environment & Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -10549,11 +10558,11 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -10562,11 +10571,11 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (CORBA::Environment &ACE CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -10588,7 +10597,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (CORBA::ULong result) { // Update the result. @@ -10603,7 +10612,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl , const CORBA::ULong & bound, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -10612,37 +10621,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_StringDef_bound_set (const TAO_ServerRequestInfo_CORBA_StringDef_bound_set &); void operator= (const TAO_ServerRequestInfo_CORBA_StringDef_bound_set &); - + private: POA_CORBA_StringDef *_tao_impl; const CORBA::ULong & bound_; - + }; TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_StringDef_bound_set ( @@ -10665,16 +10674,16 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (CORBA::Environment & Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= bound_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -10686,11 +10695,11 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -10699,7 +10708,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (CORBA::Environment &ACE CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -10738,14 +10747,14 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::_TAO_CORBA_StringDef_Strategized_ { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_StringDef_Strategized_Proxy_Broker::~_TAO_CORBA_StringDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_StringDef_Proxy_Impl& @@ -10755,26 +10764,27 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_StringDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -10787,7 +10797,7 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -10797,9 +10807,9 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -10819,13 +10829,13 @@ _TAO_CORBA_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_StringDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_StringDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_StringDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_StringDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_StringDef_Proxy_Broker_Factory_Initializer)); @@ -10932,37 +10942,37 @@ void POA_CORBA_StringDef::_get_bound_skel ( { POA_CORBA_StringDef *_tao_impl = ACE_static_cast (POA_CORBA_StringDef *, _tao_object_reference); - + CORBA::ULong _tao_retval = 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_CORBA_StringDef_bound_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->bound ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -10978,11 +10988,11 @@ void POA_CORBA_StringDef::_get_bound_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -10990,11 +11000,11 @@ void POA_CORBA_StringDef::_get_bound_skel ( 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) )) @@ -11002,7 +11012,7 @@ void POA_CORBA_StringDef::_get_bound_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -11017,7 +11027,7 @@ void POA_CORBA_StringDef::_set_bound_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_StringDef *_tao_impl = ACE_static_cast (POA_CORBA_StringDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::ULong bound; if (!( @@ -11029,12 +11039,12 @@ void POA_CORBA_StringDef::_set_bound_skel ( #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_CORBA_StringDef_bound_set ri ( _tao_server_request, _tao_upcall, @@ -11042,20 +11052,20 @@ void POA_CORBA_StringDef::_set_bound_skel ( bound, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->bound ( bound, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -11069,11 +11079,11 @@ void POA_CORBA_StringDef::_set_bound_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -11081,18 +11091,18 @@ void POA_CORBA_StringDef::_set_bound_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_StringDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -11104,10 +11114,10 @@ void POA_CORBA_StringDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -11115,7 +11125,7 @@ void POA_CORBA_StringDef::_is_a_skel ( } void POA_CORBA_StringDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -11124,7 +11134,7 @@ void POA_CORBA_StringDef::_non_existent_skel ( POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -11132,7 +11142,7 @@ void POA_CORBA_StringDef::_non_existent_skel ( } void POA_CORBA_StringDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -11141,26 +11151,26 @@ void POA_CORBA_StringDef::_interface_skel ( POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -11172,7 +11182,7 @@ void POA_CORBA_StringDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -11186,7 +11196,7 @@ CORBA::Boolean POA_CORBA_StringDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -11231,20 +11241,20 @@ POA_CORBA_StringDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_StringDef::_unchecked_narrow (obj.in ()); } @@ -11328,19 +11338,19 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int { {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA_WstringDef::_is_a_skel}, - {"destroy", &POA_CORBA_WstringDef::destroy_skel}, - {"_get_bound", &POA_CORBA_WstringDef::_get_bound_skel}, - {"_set_bound", &POA_CORBA_WstringDef::_set_bound_skel}, - {"_get_def_kind", &POA_CORBA_WstringDef::_get_def_kind_skel}, - {"_get_type", &POA_CORBA_WstringDef::_get_type_skel}, + {"destroy", &POA_CORBA_WstringDef::destroy_skel}, + {"_get_bound", &POA_CORBA_WstringDef::_get_bound_skel}, + {"_set_bound", &POA_CORBA_WstringDef::_set_bound_skel}, + {"_get_def_kind", &POA_CORBA_WstringDef::_get_def_kind_skel}, + {"_get_type", &POA_CORBA_WstringDef::_get_type_skel}, {"_interface", &POA_CORBA_WstringDef::_interface_skel}, {"_non_existent", &POA_CORBA_WstringDef::_non_existent_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, -1, 5, -1, 6, -7, -2, -20, -1, -1, 9, - 10, 11, -1, -1, 12, + -1, -1, -1, -1, -1, 5, -1, 6, -7, -2, -20, -1, -1, 9, + 10, 11, -1, -1, 12, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -11385,7 +11395,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11394,23 +11404,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -11421,7 +11431,7 @@ public: private: TAO_ServerRequestInfo_CORBA_WstringDef_bound_get (const TAO_ServerRequestInfo_CORBA_WstringDef_bound_get &); void operator= (const TAO_ServerRequestInfo_CORBA_WstringDef_bound_get &); - + private: POA_CORBA_WstringDef *_tao_impl; CORBA::ULong _result; @@ -11445,7 +11455,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -11457,11 +11467,11 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -11470,11 +11480,11 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::Environment &AC CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -11496,7 +11506,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::ULong result) { // Update the result. @@ -11511,7 +11521,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl , const CORBA::ULong & bound, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11520,37 +11530,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_WstringDef_bound_set (const TAO_ServerRequestInfo_CORBA_WstringDef_bound_set &); void operator= (const TAO_ServerRequestInfo_CORBA_WstringDef_bound_set &); - + private: POA_CORBA_WstringDef *_tao_impl; const CORBA::ULong & bound_; - + }; TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_WstringDef_bound_set ( @@ -11573,16 +11583,16 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= bound_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -11594,11 +11604,11 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -11607,7 +11617,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (CORBA::Environment &AC CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -11646,14 +11656,14 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::_TAO_CORBA_WstringDef_Strategize { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::~_TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_WstringDef_Proxy_Impl& @@ -11663,26 +11673,27 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -11695,7 +11706,7 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -11705,9 +11716,9 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -11727,13 +11738,13 @@ _TAO_CORBA_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_WstringDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_WstringDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_WstringDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_WstringDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_WstringDef_Proxy_Broker_Factory_Initializer)); @@ -11840,37 +11851,37 @@ void POA_CORBA_WstringDef::_get_bound_skel ( { POA_CORBA_WstringDef *_tao_impl = ACE_static_cast (POA_CORBA_WstringDef *, _tao_object_reference); - + CORBA::ULong _tao_retval = 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_CORBA_WstringDef_bound_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->bound ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -11886,11 +11897,11 @@ void POA_CORBA_WstringDef::_get_bound_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -11898,11 +11909,11 @@ void POA_CORBA_WstringDef::_get_bound_skel ( 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) )) @@ -11910,7 +11921,7 @@ void POA_CORBA_WstringDef::_get_bound_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -11925,7 +11936,7 @@ void POA_CORBA_WstringDef::_set_bound_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_WstringDef *_tao_impl = ACE_static_cast (POA_CORBA_WstringDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::ULong bound; if (!( @@ -11937,12 +11948,12 @@ void POA_CORBA_WstringDef::_set_bound_skel ( #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_CORBA_WstringDef_bound_set ri ( _tao_server_request, _tao_upcall, @@ -11950,20 +11961,20 @@ void POA_CORBA_WstringDef::_set_bound_skel ( bound, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->bound ( bound, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -11977,11 +11988,11 @@ void POA_CORBA_WstringDef::_set_bound_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -11989,18 +12000,18 @@ void POA_CORBA_WstringDef::_set_bound_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_WstringDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -12012,10 +12023,10 @@ void POA_CORBA_WstringDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -12023,7 +12034,7 @@ void POA_CORBA_WstringDef::_is_a_skel ( } void POA_CORBA_WstringDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -12032,7 +12043,7 @@ void POA_CORBA_WstringDef::_non_existent_skel ( POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -12040,7 +12051,7 @@ void POA_CORBA_WstringDef::_non_existent_skel ( } void POA_CORBA_WstringDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -12049,26 +12060,26 @@ void POA_CORBA_WstringDef::_interface_skel ( POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -12080,7 +12091,7 @@ void POA_CORBA_WstringDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -12094,7 +12105,7 @@ CORBA::Boolean POA_CORBA_WstringDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -12139,20 +12150,20 @@ POA_CORBA_WstringDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_WstringDef::_unchecked_narrow (obj.in ()); } @@ -12238,17 +12249,17 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in {"_is_a", &POA_CORBA_SequenceDef::_is_a_skel}, {"_interface", &POA_CORBA_SequenceDef::_interface_skel}, {"_non_existent", &POA_CORBA_SequenceDef::_non_existent_skel}, - {"_get_bound", &POA_CORBA_SequenceDef::_get_bound_skel}, - {"_set_bound", &POA_CORBA_SequenceDef::_set_bound_skel}, - {"_get_element_type", &POA_CORBA_SequenceDef::_get_element_type_skel}, - {"_get_element_type_def", &POA_CORBA_SequenceDef::_get_element_type_def_skel}, - {"_set_element_type_def", &POA_CORBA_SequenceDef::_set_element_type_def_skel}, + {"_get_bound", &POA_CORBA_SequenceDef::_get_bound_skel}, + {"_set_bound", &POA_CORBA_SequenceDef::_set_bound_skel}, + {"_get_element_type", &POA_CORBA_SequenceDef::_get_element_type_skel}, + {"_get_element_type_def", &POA_CORBA_SequenceDef::_get_element_type_def_skel}, + {"_set_element_type_def", &POA_CORBA_SequenceDef::_set_element_type_def_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, -1, 5, -1, -1, -1, -1, 6, -8, -2, 7, - -1, -25, -1, 10, -1, -11, -2, -23, + -1, -1, -1, -1, -1, 5, -1, -1, -1, -1, 6, -8, -2, 7, + -1, -25, -1, 10, -1, -11, -2, -23, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -12293,7 +12304,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12302,23 +12313,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -12329,7 +12340,7 @@ public: private: TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get (const TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get &); void operator= (const TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get &); - + private: POA_CORBA_SequenceDef *_tao_impl; CORBA::ULong _result; @@ -12353,7 +12364,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -12365,11 +12376,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12378,11 +12389,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -12404,7 +12415,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::ULong result) { // Update the result. @@ -12419,7 +12430,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl , const CORBA::ULong & bound, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12428,37 +12439,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set (const TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set &); void operator= (const TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set &); - + private: POA_CORBA_SequenceDef *_tao_impl; const CORBA::ULong & bound_; - + }; TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set ( @@ -12481,16 +12492,16 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= bound_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -12502,11 +12513,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12515,7 +12526,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -12544,7 +12555,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12553,23 +12564,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -12580,7 +12591,7 @@ public: private: TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get (const TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get &); void operator= (const TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get &); - + private: POA_CORBA_SequenceDef *_tao_impl; CORBA::TypeCode_ptr _result; @@ -12604,7 +12615,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (CORBA::Envi Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -12616,11 +12627,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (CORBA::Env Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12629,11 +12640,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::Environ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -12655,7 +12666,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -12669,7 +12680,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12678,23 +12689,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -12705,7 +12716,7 @@ public: private: TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (const TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get &); void operator= (const TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get &); - + private: POA_CORBA_SequenceDef *_tao_impl; CORBA_IDLType_ptr _result; @@ -12729,7 +12740,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (CORBA:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -12741,11 +12752,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (CORBA: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12754,11 +12765,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::Env CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -12780,7 +12791,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA_IDLType_ptr result) { // Update the result. @@ -12795,7 +12806,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl , CORBA_IDLType_ptr element_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12804,37 +12815,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set (const TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set &); void operator= (const TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set &); - + private: POA_CORBA_SequenceDef *_tao_impl; CORBA_IDLType_ptr element_type_def_; - + }; TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set ( @@ -12857,16 +12868,16 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (CORBA:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->element_type_def_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -12878,11 +12889,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (CORBA: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12891,7 +12902,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (CORBA::Env CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -12930,14 +12941,14 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::_TAO_CORBA_SequenceDef_Strategi { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::~_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_SequenceDef_Proxy_Impl& @@ -12947,26 +12958,27 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -12979,7 +12991,7 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -12989,9 +13001,9 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -13011,13 +13023,13 @@ _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_Initializer)); @@ -13218,37 +13230,37 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( { POA_CORBA_SequenceDef *_tao_impl = ACE_static_cast (POA_CORBA_SequenceDef *, _tao_object_reference); - + CORBA::ULong _tao_retval = 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_CORBA_SequenceDef_bound_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->bound ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -13264,11 +13276,11 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13276,11 +13288,11 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( 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) )) @@ -13288,7 +13300,7 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13303,7 +13315,7 @@ void POA_CORBA_SequenceDef::_set_bound_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_SequenceDef *_tao_impl = ACE_static_cast (POA_CORBA_SequenceDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::ULong bound; if (!( @@ -13315,12 +13327,12 @@ void POA_CORBA_SequenceDef::_set_bound_skel ( #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_CORBA_SequenceDef_bound_set ri ( _tao_server_request, _tao_upcall, @@ -13328,20 +13340,20 @@ void POA_CORBA_SequenceDef::_set_bound_skel ( bound, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->bound ( bound, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -13355,11 +13367,11 @@ void POA_CORBA_SequenceDef::_set_bound_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13367,12 +13379,12 @@ void POA_CORBA_SequenceDef::_set_bound_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13386,37 +13398,37 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( { POA_CORBA_SequenceDef *_tao_impl = ACE_static_cast (POA_CORBA_SequenceDef *, _tao_object_reference); - + CORBA::TypeCode_var _tao_retval; #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_CORBA_SequenceDef_element_type_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->element_type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13433,11 +13445,11 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13445,11 +13457,11 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( 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 ()) )) @@ -13457,7 +13469,7 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13471,37 +13483,37 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( { POA_CORBA_SequenceDef *_tao_impl = ACE_static_cast (POA_CORBA_SequenceDef *, _tao_object_reference); - + CORBA_IDLType_var _tao_retval; #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_CORBA_SequenceDef_element_type_def_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->element_type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13518,11 +13530,11 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13530,11 +13542,11 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( 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 ()) )) @@ -13542,7 +13554,7 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13557,7 +13569,7 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_SequenceDef *_tao_impl = ACE_static_cast (POA_CORBA_SequenceDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_IDLType_var element_type_def; if (!( @@ -13569,12 +13581,12 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel ( #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_CORBA_SequenceDef_element_type_def_set ri ( _tao_server_request, _tao_upcall, @@ -13582,20 +13594,20 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel ( element_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->element_type_def ( element_type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -13609,11 +13621,11 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13621,18 +13633,18 @@ void POA_CORBA_SequenceDef::_set_element_type_def_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_SequenceDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -13644,10 +13656,10 @@ void POA_CORBA_SequenceDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -13655,7 +13667,7 @@ void POA_CORBA_SequenceDef::_is_a_skel ( } void POA_CORBA_SequenceDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -13664,7 +13676,7 @@ void POA_CORBA_SequenceDef::_non_existent_skel ( POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -13672,7 +13684,7 @@ void POA_CORBA_SequenceDef::_non_existent_skel ( } void POA_CORBA_SequenceDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -13681,26 +13693,26 @@ void POA_CORBA_SequenceDef::_interface_skel ( POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -13712,7 +13724,7 @@ void POA_CORBA_SequenceDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -13726,7 +13738,7 @@ CORBA::Boolean POA_CORBA_SequenceDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -13771,20 +13783,20 @@ POA_CORBA_SequenceDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_SequenceDef::_unchecked_narrow (obj.in ()); } @@ -13868,22 +13880,22 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l { {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA_ArrayDef::_is_a_skel}, - {"destroy", &POA_CORBA_ArrayDef::destroy_skel}, - {"_get_type", &POA_CORBA_ArrayDef::_get_type_skel}, + {"destroy", &POA_CORBA_ArrayDef::destroy_skel}, + {"_get_type", &POA_CORBA_ArrayDef::_get_type_skel}, {"_interface", &POA_CORBA_ArrayDef::_interface_skel}, - {"_get_length", &POA_CORBA_ArrayDef::_get_length_skel}, - {"_set_length", &POA_CORBA_ArrayDef::_set_length_skel}, - {"_get_def_kind", &POA_CORBA_ArrayDef::_get_def_kind_skel}, - {"_get_element_type", &POA_CORBA_ArrayDef::_get_element_type_skel}, + {"_get_length", &POA_CORBA_ArrayDef::_get_length_skel}, + {"_set_length", &POA_CORBA_ArrayDef::_set_length_skel}, + {"_get_def_kind", &POA_CORBA_ArrayDef::_get_def_kind_skel}, + {"_get_element_type", &POA_CORBA_ArrayDef::_get_element_type_skel}, {"_non_existent", &POA_CORBA_ArrayDef::_non_existent_skel}, - {"_get_element_type_def", &POA_CORBA_ArrayDef::_get_element_type_def_skel}, - {"_set_element_type_def", &POA_CORBA_ArrayDef::_set_element_type_def_skel}, + {"_get_element_type_def", &POA_CORBA_ArrayDef::_get_element_type_def_skel}, + {"_set_element_type_def", &POA_CORBA_ArrayDef::_set_element_type_def_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -9, -2, 5, -1, 6, -1, 7, 8, -29, -1, 11, - -1, -1, -1, 12, 13, -14, -2, -23, + -1, -1, -1, -9, -2, 5, -1, 6, -1, 7, 8, -29, -1, 11, + -1, -1, -1, 12, 13, -14, -2, -23, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -13928,7 +13940,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -13937,23 +13949,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -13964,7 +13976,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ArrayDef_length_get (const TAO_ServerRequestInfo_CORBA_ArrayDef_length_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ArrayDef_length_get &); - + private: POA_CORBA_ArrayDef *_tao_impl; CORBA::ULong _result; @@ -13988,7 +14000,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (CORBA::Environment & Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -14000,11 +14012,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -14013,11 +14025,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::Environment &ACE CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -14039,7 +14051,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::ULong result) { // Update the result. @@ -14054,7 +14066,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl , const CORBA::ULong & length, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -14063,37 +14075,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ArrayDef_length_set (const TAO_ServerRequestInfo_CORBA_ArrayDef_length_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ArrayDef_length_set &); - + private: POA_CORBA_ArrayDef *_tao_impl; const CORBA::ULong & length_; - + }; TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_ArrayDef_length_set ( @@ -14116,16 +14128,16 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (CORBA::Environment & Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= length_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -14137,11 +14149,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -14150,7 +14162,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (CORBA::Environment &ACE CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -14179,7 +14191,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -14188,23 +14200,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -14215,7 +14227,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get (const TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get &); - + private: POA_CORBA_ArrayDef *_tao_impl; CORBA::TypeCode_ptr _result; @@ -14239,7 +14251,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -14251,11 +14263,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -14264,11 +14276,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -14290,7 +14302,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -14304,7 +14316,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -14313,23 +14325,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -14340,7 +14352,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (const TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get &); - + private: POA_CORBA_ArrayDef *_tao_impl; CORBA_IDLType_ptr _result; @@ -14364,7 +14376,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (CORBA::Env Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -14376,11 +14388,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (CORBA::En Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -14389,11 +14401,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::Enviro CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -14415,7 +14427,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA_IDLType_ptr result) { // Update the result. @@ -14430,7 +14442,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl , CORBA_IDLType_ptr element_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -14439,37 +14451,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set (const TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set &); - + private: POA_CORBA_ArrayDef *_tao_impl; CORBA_IDLType_ptr element_type_def_; - + }; TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set ( @@ -14492,16 +14504,16 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (CORBA::Env Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->element_type_def_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -14513,11 +14525,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (CORBA::En Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -14526,7 +14538,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (CORBA::Enviro CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -14565,14 +14577,14 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::_TAO_CORBA_ArrayDef_Strategized_Pr { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::~_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_ArrayDef_Proxy_Impl& @@ -14582,26 +14594,27 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -14614,7 +14627,7 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -14624,9 +14637,9 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -14646,13 +14659,13 @@ _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_Initializer)); @@ -14853,37 +14866,37 @@ void POA_CORBA_ArrayDef::_get_length_skel ( { POA_CORBA_ArrayDef *_tao_impl = ACE_static_cast (POA_CORBA_ArrayDef *, _tao_object_reference); - + CORBA::ULong _tao_retval = 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_CORBA_ArrayDef_length_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->length ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -14899,11 +14912,11 @@ void POA_CORBA_ArrayDef::_get_length_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -14911,11 +14924,11 @@ void POA_CORBA_ArrayDef::_get_length_skel ( 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) )) @@ -14923,7 +14936,7 @@ void POA_CORBA_ArrayDef::_get_length_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -14938,7 +14951,7 @@ void POA_CORBA_ArrayDef::_set_length_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ArrayDef *_tao_impl = ACE_static_cast (POA_CORBA_ArrayDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::ULong length; if (!( @@ -14950,12 +14963,12 @@ void POA_CORBA_ArrayDef::_set_length_skel ( #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_CORBA_ArrayDef_length_set ri ( _tao_server_request, _tao_upcall, @@ -14963,20 +14976,20 @@ void POA_CORBA_ArrayDef::_set_length_skel ( length, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->length ( length, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -14990,11 +15003,11 @@ void POA_CORBA_ArrayDef::_set_length_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -15002,12 +15015,12 @@ void POA_CORBA_ArrayDef::_set_length_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -15021,37 +15034,37 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( { POA_CORBA_ArrayDef *_tao_impl = ACE_static_cast (POA_CORBA_ArrayDef *, _tao_object_reference); - + CORBA::TypeCode_var _tao_retval; #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_CORBA_ArrayDef_element_type_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->element_type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -15068,11 +15081,11 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -15080,11 +15093,11 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( 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 ()) )) @@ -15092,7 +15105,7 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -15106,37 +15119,37 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( { POA_CORBA_ArrayDef *_tao_impl = ACE_static_cast (POA_CORBA_ArrayDef *, _tao_object_reference); - + CORBA_IDLType_var _tao_retval; #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_CORBA_ArrayDef_element_type_def_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->element_type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -15153,11 +15166,11 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -15165,11 +15178,11 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( 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 ()) )) @@ -15177,7 +15190,7 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -15192,7 +15205,7 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ArrayDef *_tao_impl = ACE_static_cast (POA_CORBA_ArrayDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_IDLType_var element_type_def; if (!( @@ -15204,12 +15217,12 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel ( #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_CORBA_ArrayDef_element_type_def_set ri ( _tao_server_request, _tao_upcall, @@ -15217,20 +15230,20 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel ( element_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->element_type_def ( element_type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -15244,11 +15257,11 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -15256,18 +15269,18 @@ void POA_CORBA_ArrayDef::_set_element_type_def_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_ArrayDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -15279,10 +15292,10 @@ void POA_CORBA_ArrayDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -15290,7 +15303,7 @@ void POA_CORBA_ArrayDef::_is_a_skel ( } void POA_CORBA_ArrayDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -15299,7 +15312,7 @@ void POA_CORBA_ArrayDef::_non_existent_skel ( POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -15307,7 +15320,7 @@ void POA_CORBA_ArrayDef::_non_existent_skel ( } void POA_CORBA_ArrayDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -15316,26 +15329,26 @@ void POA_CORBA_ArrayDef::_interface_skel ( POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -15347,7 +15360,7 @@ void POA_CORBA_ArrayDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -15361,7 +15374,7 @@ CORBA::Boolean POA_CORBA_ArrayDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -15406,20 +15419,20 @@ POA_CORBA_ArrayDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_ArrayDef::_unchecked_narrow (obj.in ()); } @@ -15503,50 +15516,50 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i { {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA_ExceptionDef::_is_a_skel}, - {"lookup", &POA_CORBA_ExceptionDef::lookup_skel}, - {"_get_type", &POA_CORBA_ExceptionDef::_get_type_skel}, - {"_set_name", &POA_CORBA_ExceptionDef::_set_name_skel}, - {"_get_name", &POA_CORBA_ExceptionDef::_get_name_skel}, + {"lookup", &POA_CORBA_ExceptionDef::lookup_skel}, + {"_get_type", &POA_CORBA_ExceptionDef::_get_type_skel}, + {"_set_name", &POA_CORBA_ExceptionDef::_set_name_skel}, + {"_get_name", &POA_CORBA_ExceptionDef::_get_name_skel}, {"_interface", &POA_CORBA_ExceptionDef::_interface_skel}, - {"lookup_name", &POA_CORBA_ExceptionDef::lookup_name_skel}, - {"_get_id", &POA_CORBA_ExceptionDef::_get_id_skel}, - {"_set_id", &POA_CORBA_ExceptionDef::_set_id_skel}, - {"describe", &POA_CORBA_ExceptionDef::describe_skel}, - {"_get_version", &POA_CORBA_ExceptionDef::_get_version_skel}, - {"_set_version", &POA_CORBA_ExceptionDef::_set_version_skel}, - {"_get_absolute_name", &POA_CORBA_ExceptionDef::_get_absolute_name_skel}, - {"move", &POA_CORBA_ExceptionDef::move_skel}, - {"_get_defined_in", &POA_CORBA_ExceptionDef::_get_defined_in_skel}, - {"_get_def_kind", &POA_CORBA_ExceptionDef::_get_def_kind_skel}, - {"destroy", &POA_CORBA_ExceptionDef::destroy_skel}, - {"_get_members", &POA_CORBA_ExceptionDef::_get_members_skel}, - {"_set_members", &POA_CORBA_ExceptionDef::_set_members_skel}, + {"lookup_name", &POA_CORBA_ExceptionDef::lookup_name_skel}, + {"_get_id", &POA_CORBA_ExceptionDef::_get_id_skel}, + {"_set_id", &POA_CORBA_ExceptionDef::_set_id_skel}, + {"describe", &POA_CORBA_ExceptionDef::describe_skel}, + {"_get_version", &POA_CORBA_ExceptionDef::_get_version_skel}, + {"_set_version", &POA_CORBA_ExceptionDef::_set_version_skel}, + {"_get_absolute_name", &POA_CORBA_ExceptionDef::_get_absolute_name_skel}, + {"move", &POA_CORBA_ExceptionDef::move_skel}, + {"_get_defined_in", &POA_CORBA_ExceptionDef::_get_defined_in_skel}, + {"_get_def_kind", &POA_CORBA_ExceptionDef::_get_def_kind_skel}, + {"destroy", &POA_CORBA_ExceptionDef::destroy_skel}, + {"_get_members", &POA_CORBA_ExceptionDef::_get_members_skel}, + {"_set_members", &POA_CORBA_ExceptionDef::_set_members_skel}, {"_non_existent", &POA_CORBA_ExceptionDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_ExceptionDef::_get_containing_repository_skel}, - {"create_value", &POA_CORBA_ExceptionDef::create_value_skel}, - {"create_module", &POA_CORBA_ExceptionDef::create_module_skel}, - {"create_native", &POA_CORBA_ExceptionDef::create_native_skel}, - {"create_interface", &POA_CORBA_ExceptionDef::create_interface_skel}, - {"create_union", &POA_CORBA_ExceptionDef::create_union_skel}, - {"describe_contents", &POA_CORBA_ExceptionDef::describe_contents_skel}, - {"create_exception", &POA_CORBA_ExceptionDef::create_exception_skel}, - {"create_local_interface", &POA_CORBA_ExceptionDef::create_local_interface_skel}, - {"create_abstract_interface", &POA_CORBA_ExceptionDef::create_abstract_interface_skel}, - {"create_enum", &POA_CORBA_ExceptionDef::create_enum_skel}, - {"contents", &POA_CORBA_ExceptionDef::contents_skel}, - {"create_value_box", &POA_CORBA_ExceptionDef::create_value_box_skel}, - {"create_alias", &POA_CORBA_ExceptionDef::create_alias_skel}, - {"create_struct", &POA_CORBA_ExceptionDef::create_struct_skel}, - {"create_constant", &POA_CORBA_ExceptionDef::create_constant_skel}, + {"_get_containing_repository", &POA_CORBA_ExceptionDef::_get_containing_repository_skel}, + {"create_value", &POA_CORBA_ExceptionDef::create_value_skel}, + {"create_module", &POA_CORBA_ExceptionDef::create_module_skel}, + {"create_native", &POA_CORBA_ExceptionDef::create_native_skel}, + {"create_interface", &POA_CORBA_ExceptionDef::create_interface_skel}, + {"create_union", &POA_CORBA_ExceptionDef::create_union_skel}, + {"describe_contents", &POA_CORBA_ExceptionDef::describe_contents_skel}, + {"create_exception", &POA_CORBA_ExceptionDef::create_exception_skel}, + {"create_local_interface", &POA_CORBA_ExceptionDef::create_local_interface_skel}, + {"create_abstract_interface", &POA_CORBA_ExceptionDef::create_abstract_interface_skel}, + {"create_enum", &POA_CORBA_ExceptionDef::create_enum_skel}, + {"contents", &POA_CORBA_ExceptionDef::contents_skel}, + {"create_value_box", &POA_CORBA_ExceptionDef::create_value_box_skel}, + {"create_alias", &POA_CORBA_ExceptionDef::create_alias_skel}, + {"create_struct", &POA_CORBA_ExceptionDef::create_struct_skel}, + {"create_constant", &POA_CORBA_ExceptionDef::create_constant_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -7, -3, 5, 6, -12, -2, -66, 10, 11, -1, -15, - -2, -68, 14, -64, 17, 18, 19, 20, -1, -1, -1, 21, -1, -1, - -1, -1, -22, -2, -62, 24, -27, -2, 25, 26, -64, -1, -1, 29, - 30, -1, -1, 31, 32, 33, -1, -1, 34, 35, -1, 36, -1, -1, - 37, 38, 39, -1, 40, + -1, -1, -1, -7, -3, 5, 6, -12, -2, -66, 10, 11, -1, -15, + -2, -68, 14, -64, 17, 18, 19, 20, -1, -1, -1, 21, -1, -1, + -1, -1, -22, -2, -62, 24, -27, -2, 25, 26, -64, -1, -1, 29, + 30, -1, -1, 31, 32, 33, -1, -1, 34, 35, -1, 36, -1, -1, + 37, 38, 39, -1, 40, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -15591,7 +15604,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -15600,23 +15613,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -15627,7 +15640,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get (const TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get &); - + private: POA_CORBA_ExceptionDef *_tao_impl; CORBA::TypeCode_ptr _result; @@ -15651,7 +15664,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -15663,11 +15676,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -15676,11 +15689,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -15702,7 +15715,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -15716,7 +15729,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -15725,23 +15738,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -15752,7 +15765,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (const TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get &); - + private: POA_CORBA_ExceptionDef *_tao_impl; CORBA_StructMemberSeq * _result; @@ -15776,7 +15789,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (CORBA::Environm Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -15788,11 +15801,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (CORBA::Environ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -15801,11 +15814,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -15827,7 +15840,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA_StructMemberSeq * result) { // Update the result. @@ -15842,7 +15855,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl , const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -15851,37 +15864,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set (const TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set &); - + private: POA_CORBA_ExceptionDef *_tao_impl; const CORBA_StructMemberSeq & members_; - + }; TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set ( @@ -15904,16 +15917,16 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (CORBA::Environm Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->members_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -15925,11 +15938,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (CORBA::Environ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -15938,7 +15951,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -15977,14 +15990,14 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::_TAO_CORBA_ExceptionDef_Strate { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_ExceptionDef_Proxy_Impl& @@ -15994,26 +16007,27 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -16026,7 +16040,7 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -16036,9 +16050,9 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -16058,13 +16072,13 @@ _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_Initializer)); @@ -16203,37 +16217,37 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( { POA_CORBA_ExceptionDef *_tao_impl = ACE_static_cast (POA_CORBA_ExceptionDef *, _tao_object_reference); - + CORBA::TypeCode_var _tao_retval; #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_CORBA_ExceptionDef_type_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -16250,11 +16264,11 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -16262,11 +16276,11 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( 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 ()) )) @@ -16274,7 +16288,7 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -16288,37 +16302,37 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( { POA_CORBA_ExceptionDef *_tao_impl = ACE_static_cast (POA_CORBA_ExceptionDef *, _tao_object_reference); - + CORBA_StructMemberSeq_var _tao_retval; #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_CORBA_ExceptionDef_members_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->members ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_StructMemberSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -16335,11 +16349,11 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -16347,11 +16361,11 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( 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 ()) )) @@ -16359,7 +16373,7 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -16374,7 +16388,7 @@ void POA_CORBA_ExceptionDef::_set_members_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ExceptionDef *_tao_impl = ACE_static_cast (POA_CORBA_ExceptionDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_StructMemberSeq members; if (!( @@ -16386,12 +16400,12 @@ void POA_CORBA_ExceptionDef::_set_members_skel ( #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_CORBA_ExceptionDef_members_set ri ( _tao_server_request, _tao_upcall, @@ -16399,20 +16413,20 @@ void POA_CORBA_ExceptionDef::_set_members_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->members ( members, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -16426,11 +16440,11 @@ void POA_CORBA_ExceptionDef::_set_members_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -16438,18 +16452,18 @@ void POA_CORBA_ExceptionDef::_set_members_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_ExceptionDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -16461,10 +16475,10 @@ void POA_CORBA_ExceptionDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -16472,7 +16486,7 @@ void POA_CORBA_ExceptionDef::_is_a_skel ( } void POA_CORBA_ExceptionDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -16481,7 +16495,7 @@ void POA_CORBA_ExceptionDef::_non_existent_skel ( POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -16489,7 +16503,7 @@ void POA_CORBA_ExceptionDef::_non_existent_skel ( } void POA_CORBA_ExceptionDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -16498,26 +16512,26 @@ void POA_CORBA_ExceptionDef::_interface_skel ( POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -16529,7 +16543,7 @@ void POA_CORBA_ExceptionDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -16543,7 +16557,7 @@ CORBA::Boolean POA_CORBA_ExceptionDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -16591,20 +16605,20 @@ POA_CORBA_ExceptionDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_ExceptionDef::_unchecked_narrow (obj.in ()); } @@ -16687,34 +16701,34 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_AttributeDef::move_skel}, + {"move", &POA_CORBA_AttributeDef::move_skel}, {"_is_a", &POA_CORBA_AttributeDef::_is_a_skel}, - {"_get_id", &POA_CORBA_AttributeDef::_get_id_skel}, - {"_set_id", &POA_CORBA_AttributeDef::_set_id_skel}, - {"describe", &POA_CORBA_AttributeDef::describe_skel}, - {"_get_type", &POA_CORBA_AttributeDef::_get_type_skel}, - {"_set_name", &POA_CORBA_AttributeDef::_set_name_skel}, - {"_get_name", &POA_CORBA_AttributeDef::_get_name_skel}, - {"_set_mode", &POA_CORBA_AttributeDef::_set_mode_skel}, - {"_get_mode", &POA_CORBA_AttributeDef::_get_mode_skel}, + {"_get_id", &POA_CORBA_AttributeDef::_get_id_skel}, + {"_set_id", &POA_CORBA_AttributeDef::_set_id_skel}, + {"describe", &POA_CORBA_AttributeDef::describe_skel}, + {"_get_type", &POA_CORBA_AttributeDef::_get_type_skel}, + {"_set_name", &POA_CORBA_AttributeDef::_set_name_skel}, + {"_get_name", &POA_CORBA_AttributeDef::_get_name_skel}, + {"_set_mode", &POA_CORBA_AttributeDef::_set_mode_skel}, + {"_get_mode", &POA_CORBA_AttributeDef::_get_mode_skel}, {"_interface", &POA_CORBA_AttributeDef::_interface_skel}, - {"_get_version", &POA_CORBA_AttributeDef::_get_version_skel}, - {"_set_version", &POA_CORBA_AttributeDef::_set_version_skel}, - {"_get_def_kind", &POA_CORBA_AttributeDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_CORBA_AttributeDef::_get_defined_in_skel}, - {"destroy", &POA_CORBA_AttributeDef::destroy_skel}, - {"_get_absolute_name", &POA_CORBA_AttributeDef::_get_absolute_name_skel}, - {"_get_type_def", &POA_CORBA_AttributeDef::_get_type_def_skel}, - {"_set_type_def", &POA_CORBA_AttributeDef::_set_type_def_skel}, + {"_get_version", &POA_CORBA_AttributeDef::_get_version_skel}, + {"_set_version", &POA_CORBA_AttributeDef::_set_version_skel}, + {"_get_def_kind", &POA_CORBA_AttributeDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_CORBA_AttributeDef::_get_defined_in_skel}, + {"destroy", &POA_CORBA_AttributeDef::destroy_skel}, + {"_get_absolute_name", &POA_CORBA_AttributeDef::_get_absolute_name_skel}, + {"_get_type_def", &POA_CORBA_AttributeDef::_get_type_def_skel}, + {"_set_type_def", &POA_CORBA_AttributeDef::_set_type_def_skel}, {"_non_existent", &POA_CORBA_AttributeDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_AttributeDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_CORBA_AttributeDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -5, -15, -2, 4, 5, -1, 48, 8, -45, 14, -1, -46, 17, - -1, 18, -1, 19, 20, -6, -2, -21, -2, -38, -1, -1, -1, -1, - 23, -1, -1, -1, -1, -1, -1, -1, 24, + -9, -5, -15, -2, 4, 5, -1, 48, 8, -45, 14, -1, -46, 17, + -1, 18, -1, 19, 20, -6, -2, -21, -2, -38, -1, -1, -1, -1, + 23, -1, -1, -1, -1, -1, -1, -1, 24, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -16759,7 +16773,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16768,23 +16782,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -16795,7 +16809,7 @@ public: private: TAO_ServerRequestInfo_CORBA_AttributeDef_type_get (const TAO_ServerRequestInfo_CORBA_AttributeDef_type_get &); void operator= (const TAO_ServerRequestInfo_CORBA_AttributeDef_type_get &); - + private: POA_CORBA_AttributeDef *_tao_impl; CORBA::TypeCode_ptr _result; @@ -16819,7 +16833,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -16831,11 +16845,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -16844,11 +16858,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -16870,7 +16884,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -16884,7 +16898,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16893,23 +16907,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -16920,7 +16934,7 @@ public: private: TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (const TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get &); void operator= (const TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get &); - + private: POA_CORBA_AttributeDef *_tao_impl; CORBA_IDLType_ptr _result; @@ -16944,7 +16958,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -16956,11 +16970,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -16969,11 +16983,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -16995,7 +17009,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA_IDLType_ptr result) { // Update the result. @@ -17010,7 +17024,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl , CORBA_IDLType_ptr type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -17019,37 +17033,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set (const TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set &); void operator= (const TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set &); - + private: POA_CORBA_AttributeDef *_tao_impl; CORBA_IDLType_ptr type_def_; - + }; TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set ( @@ -17072,16 +17086,16 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->type_def_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -17093,11 +17107,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -17106,7 +17120,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -17135,7 +17149,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -17144,23 +17158,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -17171,7 +17185,7 @@ public: private: TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get (const TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get &); void operator= (const TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get &); - + private: POA_CORBA_AttributeDef *_tao_impl; CORBA::AttributeMode _result; @@ -17195,7 +17209,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -17207,11 +17221,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -17220,11 +17234,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -17246,7 +17260,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::AttributeMode result) { // Update the result. @@ -17261,7 +17275,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl , CORBA::AttributeMode & mode, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -17270,37 +17284,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set (const TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set &); void operator= (const TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set &); - + private: POA_CORBA_AttributeDef *_tao_impl; const CORBA::AttributeMode & mode_; - + }; TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set ( @@ -17323,16 +17337,16 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->mode_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -17344,11 +17358,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -17357,7 +17371,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -17396,14 +17410,14 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::_TAO_CORBA_AttributeDef_Strate { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::~_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_AttributeDef_Proxy_Impl& @@ -17413,26 +17427,27 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -17445,7 +17460,7 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -17455,9 +17470,9 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -17477,13 +17492,13 @@ _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_Initializer)); @@ -17684,37 +17699,37 @@ void POA_CORBA_AttributeDef::_get_type_skel ( { POA_CORBA_AttributeDef *_tao_impl = ACE_static_cast (POA_CORBA_AttributeDef *, _tao_object_reference); - + CORBA::TypeCode_var _tao_retval; #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_CORBA_AttributeDef_type_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -17731,11 +17746,11 @@ void POA_CORBA_AttributeDef::_get_type_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -17743,11 +17758,11 @@ void POA_CORBA_AttributeDef::_get_type_skel ( 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 ()) )) @@ -17755,7 +17770,7 @@ void POA_CORBA_AttributeDef::_get_type_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -17769,37 +17784,37 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( { POA_CORBA_AttributeDef *_tao_impl = ACE_static_cast (POA_CORBA_AttributeDef *, _tao_object_reference); - + CORBA_IDLType_var _tao_retval; #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_CORBA_AttributeDef_type_def_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -17816,11 +17831,11 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -17828,11 +17843,11 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( 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 ()) )) @@ -17840,7 +17855,7 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -17855,7 +17870,7 @@ void POA_CORBA_AttributeDef::_set_type_def_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_AttributeDef *_tao_impl = ACE_static_cast (POA_CORBA_AttributeDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_IDLType_var type_def; if (!( @@ -17867,12 +17882,12 @@ void POA_CORBA_AttributeDef::_set_type_def_skel ( #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_CORBA_AttributeDef_type_def_set ri ( _tao_server_request, _tao_upcall, @@ -17880,20 +17895,20 @@ void POA_CORBA_AttributeDef::_set_type_def_skel ( type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->type_def ( type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -17907,11 +17922,11 @@ void POA_CORBA_AttributeDef::_set_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -17919,12 +17934,12 @@ void POA_CORBA_AttributeDef::_set_type_def_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -17938,37 +17953,37 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( { POA_CORBA_AttributeDef *_tao_impl = ACE_static_cast (POA_CORBA_AttributeDef *, _tao_object_reference); - + CORBA::AttributeMode _tao_retval; #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_CORBA_AttributeDef_mode_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->mode ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::AttributeMode _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -17984,11 +17999,11 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -17996,11 +18011,11 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( 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) )) @@ -18008,7 +18023,7 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -18023,7 +18038,7 @@ void POA_CORBA_AttributeDef::_set_mode_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_AttributeDef *_tao_impl = ACE_static_cast (POA_CORBA_AttributeDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::AttributeMode mode; if (!( @@ -18035,12 +18050,12 @@ void POA_CORBA_AttributeDef::_set_mode_skel ( #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_CORBA_AttributeDef_mode_set ri ( _tao_server_request, _tao_upcall, @@ -18048,20 +18063,20 @@ void POA_CORBA_AttributeDef::_set_mode_skel ( mode, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->mode ( mode, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -18075,11 +18090,11 @@ void POA_CORBA_AttributeDef::_set_mode_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -18087,18 +18102,18 @@ void POA_CORBA_AttributeDef::_set_mode_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_AttributeDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -18110,10 +18125,10 @@ void POA_CORBA_AttributeDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -18121,7 +18136,7 @@ void POA_CORBA_AttributeDef::_is_a_skel ( } void POA_CORBA_AttributeDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -18130,7 +18145,7 @@ void POA_CORBA_AttributeDef::_non_existent_skel ( POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -18138,7 +18153,7 @@ void POA_CORBA_AttributeDef::_non_existent_skel ( } void POA_CORBA_AttributeDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -18147,26 +18162,26 @@ void POA_CORBA_AttributeDef::_interface_skel ( POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -18178,7 +18193,7 @@ void POA_CORBA_AttributeDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -18192,7 +18207,7 @@ CORBA::Boolean POA_CORBA_AttributeDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -18237,20 +18252,20 @@ POA_CORBA_AttributeDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_AttributeDef::_unchecked_narrow (obj.in ()); } @@ -18333,33 +18348,33 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_OperationDef::move_skel}, + {"move", &POA_CORBA_OperationDef::move_skel}, {"_is_a", &POA_CORBA_OperationDef::_is_a_skel}, - {"_get_mode", &POA_CORBA_OperationDef::_get_mode_skel}, - {"_set_name", &POA_CORBA_OperationDef::_set_name_skel}, - {"_get_name", &POA_CORBA_OperationDef::_get_name_skel}, - {"_set_mode", &POA_CORBA_OperationDef::_set_mode_skel}, + {"_get_mode", &POA_CORBA_OperationDef::_get_mode_skel}, + {"_set_name", &POA_CORBA_OperationDef::_set_name_skel}, + {"_get_name", &POA_CORBA_OperationDef::_get_name_skel}, + {"_set_mode", &POA_CORBA_OperationDef::_set_mode_skel}, {"_interface", &POA_CORBA_OperationDef::_interface_skel}, - {"_get_params", &POA_CORBA_OperationDef::_get_params_skel}, - {"_set_params", &POA_CORBA_OperationDef::_set_params_skel}, - {"_get_contexts", &POA_CORBA_OperationDef::_get_contexts_skel}, - {"_set_contexts", &POA_CORBA_OperationDef::_set_contexts_skel}, - {"_get_exceptions", &POA_CORBA_OperationDef::_get_exceptions_skel}, - {"_set_exceptions", &POA_CORBA_OperationDef::_set_exceptions_skel}, - {"_get_version", &POA_CORBA_OperationDef::_get_version_skel}, - {"_set_version", &POA_CORBA_OperationDef::_set_version_skel}, - {"_get_absolute_name", &POA_CORBA_OperationDef::_get_absolute_name_skel}, - {"_get_defined_in", &POA_CORBA_OperationDef::_get_defined_in_skel}, - {"_get_id", &POA_CORBA_OperationDef::_get_id_skel}, - {"_set_id", &POA_CORBA_OperationDef::_set_id_skel}, - {"describe", &POA_CORBA_OperationDef::describe_skel}, - {"_get_result_def", &POA_CORBA_OperationDef::_get_result_def_skel}, - {"_set_result_def", &POA_CORBA_OperationDef::_set_result_def_skel}, - {"_get_def_kind", &POA_CORBA_OperationDef::_get_def_kind_skel}, - {"_get_result", &POA_CORBA_OperationDef::_get_result_skel}, - {"destroy", &POA_CORBA_OperationDef::destroy_skel}, + {"_get_params", &POA_CORBA_OperationDef::_get_params_skel}, + {"_set_params", &POA_CORBA_OperationDef::_set_params_skel}, + {"_get_contexts", &POA_CORBA_OperationDef::_get_contexts_skel}, + {"_set_contexts", &POA_CORBA_OperationDef::_set_contexts_skel}, + {"_get_exceptions", &POA_CORBA_OperationDef::_get_exceptions_skel}, + {"_set_exceptions", &POA_CORBA_OperationDef::_set_exceptions_skel}, + {"_get_version", &POA_CORBA_OperationDef::_get_version_skel}, + {"_set_version", &POA_CORBA_OperationDef::_set_version_skel}, + {"_get_absolute_name", &POA_CORBA_OperationDef::_get_absolute_name_skel}, + {"_get_defined_in", &POA_CORBA_OperationDef::_get_defined_in_skel}, + {"_get_id", &POA_CORBA_OperationDef::_get_id_skel}, + {"_set_id", &POA_CORBA_OperationDef::_set_id_skel}, + {"describe", &POA_CORBA_OperationDef::describe_skel}, + {"_get_result_def", &POA_CORBA_OperationDef::_get_result_def_skel}, + {"_set_result_def", &POA_CORBA_OperationDef::_set_result_def_skel}, + {"_get_def_kind", &POA_CORBA_OperationDef::_get_def_kind_skel}, + {"_get_result", &POA_CORBA_OperationDef::_get_result_skel}, + {"destroy", &POA_CORBA_OperationDef::destroy_skel}, {"_non_existent", &POA_CORBA_OperationDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_OperationDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_CORBA_OperationDef::_get_containing_repository_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -18369,7 +18384,7 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) { { - const class TAO_operation_db_entry *resword; + const class TAO_operation_db_entry *resword; switch (key) { @@ -18462,7 +18477,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -18471,23 +18486,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -18498,7 +18513,7 @@ public: private: TAO_ServerRequestInfo_CORBA_OperationDef_result_get (const TAO_ServerRequestInfo_CORBA_OperationDef_result_get &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_result_get &); - + private: POA_CORBA_OperationDef *_tao_impl; CORBA::TypeCode_ptr _result; @@ -18522,7 +18537,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -18534,11 +18549,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -18547,11 +18562,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -18573,7 +18588,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -18587,7 +18602,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -18596,23 +18611,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -18623,7 +18638,7 @@ public: private: TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (const TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get &); - + private: POA_CORBA_OperationDef *_tao_impl; CORBA_IDLType_ptr _result; @@ -18647,7 +18662,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -18659,11 +18674,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -18672,11 +18687,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -18698,7 +18713,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA_IDLType_ptr result) { // Update the result. @@ -18713,7 +18728,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , CORBA_IDLType_ptr result_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -18722,37 +18737,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set (const TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set &); - + private: POA_CORBA_OperationDef *_tao_impl; CORBA_IDLType_ptr result_def_; - + }; TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set ( @@ -18775,16 +18790,16 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->result_def_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -18796,11 +18811,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -18809,7 +18824,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -18838,7 +18853,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -18847,23 +18862,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -18874,7 +18889,7 @@ public: private: TAO_ServerRequestInfo_CORBA_OperationDef_params_get (const TAO_ServerRequestInfo_CORBA_OperationDef_params_get &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_params_get &); - + private: POA_CORBA_OperationDef *_tao_impl; CORBA_ParDescriptionSeq * _result; @@ -18898,7 +18913,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -18910,11 +18925,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -18923,11 +18938,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -18949,7 +18964,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (CORBA_ParDescriptionSeq * result) { // Update the result. @@ -18964,7 +18979,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , const CORBA_ParDescriptionSeq & params, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -18973,37 +18988,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_OperationDef_params_set (const TAO_ServerRequestInfo_CORBA_OperationDef_params_set &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_params_set &); - + private: POA_CORBA_OperationDef *_tao_impl; const CORBA_ParDescriptionSeq & params_; - + }; TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA_OperationDef_params_set ( @@ -19026,16 +19041,16 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->params_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -19047,11 +19062,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19060,7 +19075,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -19089,7 +19104,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -19098,23 +19113,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -19125,7 +19140,7 @@ public: private: TAO_ServerRequestInfo_CORBA_OperationDef_mode_get (const TAO_ServerRequestInfo_CORBA_OperationDef_mode_get &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_mode_get &); - + private: POA_CORBA_OperationDef *_tao_impl; CORBA::OperationMode _result; @@ -19149,7 +19164,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -19161,11 +19176,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19174,11 +19189,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -19200,7 +19215,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::OperationMode result) { // Update the result. @@ -19215,7 +19230,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , CORBA::OperationMode & mode, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -19224,37 +19239,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_OperationDef_mode_set (const TAO_ServerRequestInfo_CORBA_OperationDef_mode_set &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_mode_set &); - + private: POA_CORBA_OperationDef *_tao_impl; const CORBA::OperationMode & mode_; - + }; TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_OperationDef_mode_set ( @@ -19277,16 +19292,16 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->mode_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -19298,11 +19313,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19311,7 +19326,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -19340,7 +19355,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -19349,23 +19364,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -19376,7 +19391,7 @@ public: private: TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (const TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get &); - + private: POA_CORBA_OperationDef *_tao_impl; CORBA_ContextIdSeq * _result; @@ -19400,7 +19415,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -19412,11 +19427,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19425,11 +19440,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -19451,7 +19466,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA_ContextIdSeq * result) { // Update the result. @@ -19466,7 +19481,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , const CORBA_ContextIdSeq & contexts, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -19475,37 +19490,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set (const TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set &); - + private: POA_CORBA_OperationDef *_tao_impl; const CORBA_ContextIdSeq & contexts_; - + }; TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set ( @@ -19528,16 +19543,16 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->contexts_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -19549,11 +19564,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19562,7 +19577,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -19591,7 +19606,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -19600,23 +19615,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -19627,7 +19642,7 @@ public: private: TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (const TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get &); - + private: POA_CORBA_OperationDef *_tao_impl; CORBA_ExceptionDefSeq * _result; @@ -19651,7 +19666,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -19663,11 +19678,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19676,11 +19691,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -19702,7 +19717,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA_ExceptionDefSeq * result) { // Update the result. @@ -19717,7 +19732,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , const CORBA_ExceptionDefSeq & exceptions, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -19726,37 +19741,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set (const TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set &); void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set &); - + private: POA_CORBA_OperationDef *_tao_impl; const CORBA_ExceptionDefSeq & exceptions_; - + }; TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set ( @@ -19779,16 +19794,16 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->exceptions_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -19800,11 +19815,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19813,7 +19828,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -19852,14 +19867,14 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::_TAO_CORBA_OperationDef_Strate { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::~_TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_OperationDef_Proxy_Impl& @@ -19869,26 +19884,27 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -19901,7 +19917,7 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -19911,9 +19927,9 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -19933,13 +19949,13 @@ _TAO_CORBA_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_OperationDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_OperationDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_OperationDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_OperationDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_OperationDef_Proxy_Broker_Factory_Initializer)); @@ -20329,37 +20345,37 @@ void POA_CORBA_OperationDef::_get_result_skel ( { POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + CORBA::TypeCode_var _tao_retval; #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_CORBA_OperationDef_result_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->result ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -20376,11 +20392,11 @@ void POA_CORBA_OperationDef::_get_result_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -20388,11 +20404,11 @@ void POA_CORBA_OperationDef::_get_result_skel ( 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 ()) )) @@ -20400,7 +20416,7 @@ void POA_CORBA_OperationDef::_get_result_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -20414,37 +20430,37 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( { POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + CORBA_IDLType_var _tao_retval; #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_CORBA_OperationDef_result_def_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->result_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -20461,11 +20477,11 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -20473,11 +20489,11 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( 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 ()) )) @@ -20485,7 +20501,7 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -20500,7 +20516,7 @@ void POA_CORBA_OperationDef::_set_result_def_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_IDLType_var result_def; if (!( @@ -20512,12 +20528,12 @@ void POA_CORBA_OperationDef::_set_result_def_skel ( #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_CORBA_OperationDef_result_def_set ri ( _tao_server_request, _tao_upcall, @@ -20525,20 +20541,20 @@ void POA_CORBA_OperationDef::_set_result_def_skel ( result_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->result_def ( result_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -20552,11 +20568,11 @@ void POA_CORBA_OperationDef::_set_result_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -20564,12 +20580,12 @@ void POA_CORBA_OperationDef::_set_result_def_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -20583,37 +20599,37 @@ void POA_CORBA_OperationDef::_get_params_skel ( { POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + CORBA_ParDescriptionSeq_var _tao_retval; #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_CORBA_OperationDef_params_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->params ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ParDescriptionSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -20630,11 +20646,11 @@ void POA_CORBA_OperationDef::_get_params_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -20642,11 +20658,11 @@ void POA_CORBA_OperationDef::_get_params_skel ( 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 ()) )) @@ -20654,7 +20670,7 @@ void POA_CORBA_OperationDef::_get_params_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -20669,7 +20685,7 @@ void POA_CORBA_OperationDef::_set_params_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_ParDescriptionSeq params; if (!( @@ -20681,12 +20697,12 @@ void POA_CORBA_OperationDef::_set_params_skel ( #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_CORBA_OperationDef_params_set ri ( _tao_server_request, _tao_upcall, @@ -20694,20 +20710,20 @@ void POA_CORBA_OperationDef::_set_params_skel ( params, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->params ( params, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -20721,11 +20737,11 @@ void POA_CORBA_OperationDef::_set_params_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -20733,12 +20749,12 @@ void POA_CORBA_OperationDef::_set_params_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -20752,37 +20768,37 @@ void POA_CORBA_OperationDef::_get_mode_skel ( { POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + CORBA::OperationMode _tao_retval; #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_CORBA_OperationDef_mode_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->mode ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::OperationMode _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -20798,11 +20814,11 @@ void POA_CORBA_OperationDef::_get_mode_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -20810,11 +20826,11 @@ void POA_CORBA_OperationDef::_get_mode_skel ( 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) )) @@ -20822,7 +20838,7 @@ void POA_CORBA_OperationDef::_get_mode_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -20837,7 +20853,7 @@ void POA_CORBA_OperationDef::_set_mode_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::OperationMode mode; if (!( @@ -20849,12 +20865,12 @@ void POA_CORBA_OperationDef::_set_mode_skel ( #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_CORBA_OperationDef_mode_set ri ( _tao_server_request, _tao_upcall, @@ -20862,20 +20878,20 @@ void POA_CORBA_OperationDef::_set_mode_skel ( mode, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->mode ( mode, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -20889,11 +20905,11 @@ void POA_CORBA_OperationDef::_set_mode_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -20901,12 +20917,12 @@ void POA_CORBA_OperationDef::_set_mode_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -20920,37 +20936,37 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( { POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + CORBA_ContextIdSeq_var _tao_retval; #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_CORBA_OperationDef_contexts_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->contexts ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ContextIdSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -20967,11 +20983,11 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -20979,11 +20995,11 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( 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 ()) )) @@ -20991,7 +21007,7 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -21006,7 +21022,7 @@ void POA_CORBA_OperationDef::_set_contexts_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_ContextIdSeq contexts; if (!( @@ -21018,12 +21034,12 @@ void POA_CORBA_OperationDef::_set_contexts_skel ( #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_CORBA_OperationDef_contexts_set ri ( _tao_server_request, _tao_upcall, @@ -21031,20 +21047,20 @@ void POA_CORBA_OperationDef::_set_contexts_skel ( contexts, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->contexts ( contexts, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -21058,11 +21074,11 @@ void POA_CORBA_OperationDef::_set_contexts_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -21070,12 +21086,12 @@ void POA_CORBA_OperationDef::_set_contexts_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -21089,37 +21105,37 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( { POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + CORBA_ExceptionDefSeq_var _tao_retval; #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_CORBA_OperationDef_exceptions_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->exceptions ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ExceptionDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -21136,11 +21152,11 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -21148,11 +21164,11 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( 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 ()) )) @@ -21160,7 +21176,7 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -21175,7 +21191,7 @@ void POA_CORBA_OperationDef::_set_exceptions_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_OperationDef *_tao_impl = ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_ExceptionDefSeq exceptions; if (!( @@ -21187,12 +21203,12 @@ void POA_CORBA_OperationDef::_set_exceptions_skel ( #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_CORBA_OperationDef_exceptions_set ri ( _tao_server_request, _tao_upcall, @@ -21200,20 +21216,20 @@ void POA_CORBA_OperationDef::_set_exceptions_skel ( exceptions, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->exceptions ( exceptions, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -21227,11 +21243,11 @@ void POA_CORBA_OperationDef::_set_exceptions_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -21239,18 +21255,18 @@ void POA_CORBA_OperationDef::_set_exceptions_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_OperationDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -21262,10 +21278,10 @@ void POA_CORBA_OperationDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -21273,7 +21289,7 @@ void POA_CORBA_OperationDef::_is_a_skel ( } void POA_CORBA_OperationDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -21282,7 +21298,7 @@ void POA_CORBA_OperationDef::_non_existent_skel ( POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -21290,7 +21306,7 @@ void POA_CORBA_OperationDef::_non_existent_skel ( } void POA_CORBA_OperationDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -21299,26 +21315,26 @@ void POA_CORBA_OperationDef::_interface_skel ( POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -21330,7 +21346,7 @@ void POA_CORBA_OperationDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -21344,7 +21360,7 @@ CORBA::Boolean POA_CORBA_OperationDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -21389,20 +21405,20 @@ POA_CORBA_OperationDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_OperationDef::_unchecked_narrow (obj.in ()); } @@ -21485,56 +21501,56 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_InterfaceDef::move_skel}, - {"is_a", &POA_CORBA_InterfaceDef::is_a_skel}, - {"create_enum", &POA_CORBA_InterfaceDef::create_enum_skel}, - {"create_value", &POA_CORBA_InterfaceDef::create_value_skel}, - {"create_module", &POA_CORBA_InterfaceDef::create_module_skel}, - {"create_native", &POA_CORBA_InterfaceDef::create_native_skel}, - {"create_attribute", &POA_CORBA_InterfaceDef::create_attribute_skel}, - {"create_interface", &POA_CORBA_InterfaceDef::create_interface_skel}, - {"create_union", &POA_CORBA_InterfaceDef::create_union_skel}, - {"create_operation", &POA_CORBA_InterfaceDef::create_operation_skel}, - {"create_exception", &POA_CORBA_InterfaceDef::create_exception_skel}, - {"create_local_interface", &POA_CORBA_InterfaceDef::create_local_interface_skel}, - {"create_struct", &POA_CORBA_InterfaceDef::create_struct_skel}, - {"create_abstract_interface", &POA_CORBA_InterfaceDef::create_abstract_interface_skel}, - {"create_constant", &POA_CORBA_InterfaceDef::create_constant_skel}, - {"destroy", &POA_CORBA_InterfaceDef::destroy_skel}, - {"describe", &POA_CORBA_InterfaceDef::describe_skel}, + {"move", &POA_CORBA_InterfaceDef::move_skel}, + {"is_a", &POA_CORBA_InterfaceDef::is_a_skel}, + {"create_enum", &POA_CORBA_InterfaceDef::create_enum_skel}, + {"create_value", &POA_CORBA_InterfaceDef::create_value_skel}, + {"create_module", &POA_CORBA_InterfaceDef::create_module_skel}, + {"create_native", &POA_CORBA_InterfaceDef::create_native_skel}, + {"create_attribute", &POA_CORBA_InterfaceDef::create_attribute_skel}, + {"create_interface", &POA_CORBA_InterfaceDef::create_interface_skel}, + {"create_union", &POA_CORBA_InterfaceDef::create_union_skel}, + {"create_operation", &POA_CORBA_InterfaceDef::create_operation_skel}, + {"create_exception", &POA_CORBA_InterfaceDef::create_exception_skel}, + {"create_local_interface", &POA_CORBA_InterfaceDef::create_local_interface_skel}, + {"create_struct", &POA_CORBA_InterfaceDef::create_struct_skel}, + {"create_abstract_interface", &POA_CORBA_InterfaceDef::create_abstract_interface_skel}, + {"create_constant", &POA_CORBA_InterfaceDef::create_constant_skel}, + {"destroy", &POA_CORBA_InterfaceDef::destroy_skel}, + {"describe", &POA_CORBA_InterfaceDef::describe_skel}, {"_is_a", &POA_CORBA_InterfaceDef::_is_a_skel}, - {"lookup_name", &POA_CORBA_InterfaceDef::lookup_name_skel}, - {"contents", &POA_CORBA_InterfaceDef::contents_skel}, - {"_get_name", &POA_CORBA_InterfaceDef::_get_name_skel}, - {"_get_type", &POA_CORBA_InterfaceDef::_get_type_skel}, - {"_set_name", &POA_CORBA_InterfaceDef::_set_name_skel}, + {"lookup_name", &POA_CORBA_InterfaceDef::lookup_name_skel}, + {"contents", &POA_CORBA_InterfaceDef::contents_skel}, + {"_get_name", &POA_CORBA_InterfaceDef::_get_name_skel}, + {"_get_type", &POA_CORBA_InterfaceDef::_get_type_skel}, + {"_set_name", &POA_CORBA_InterfaceDef::_set_name_skel}, {"_interface", &POA_CORBA_InterfaceDef::_interface_skel}, - {"create_value_box", &POA_CORBA_InterfaceDef::create_value_box_skel}, - {"create_alias", &POA_CORBA_InterfaceDef::create_alias_skel}, - {"describe_interface", &POA_CORBA_InterfaceDef::describe_interface_skel}, - {"lookup", &POA_CORBA_InterfaceDef::lookup_skel}, - {"_get_version", &POA_CORBA_InterfaceDef::_get_version_skel}, - {"_set_version", &POA_CORBA_InterfaceDef::_set_version_skel}, - {"_get_absolute_name", &POA_CORBA_InterfaceDef::_get_absolute_name_skel}, - {"_get_defined_in", &POA_CORBA_InterfaceDef::_get_defined_in_skel}, + {"create_value_box", &POA_CORBA_InterfaceDef::create_value_box_skel}, + {"create_alias", &POA_CORBA_InterfaceDef::create_alias_skel}, + {"describe_interface", &POA_CORBA_InterfaceDef::describe_interface_skel}, + {"lookup", &POA_CORBA_InterfaceDef::lookup_skel}, + {"_get_version", &POA_CORBA_InterfaceDef::_get_version_skel}, + {"_set_version", &POA_CORBA_InterfaceDef::_set_version_skel}, + {"_get_absolute_name", &POA_CORBA_InterfaceDef::_get_absolute_name_skel}, + {"_get_defined_in", &POA_CORBA_InterfaceDef::_get_defined_in_skel}, {"_non_existent", &POA_CORBA_InterfaceDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_InterfaceDef::_get_containing_repository_skel}, - {"_get_id", &POA_CORBA_InterfaceDef::_get_id_skel}, - {"_set_id", &POA_CORBA_InterfaceDef::_set_id_skel}, - {"_get_def_kind", &POA_CORBA_InterfaceDef::_get_def_kind_skel}, - {"describe_contents", &POA_CORBA_InterfaceDef::describe_contents_skel}, - {"_get_base_interfaces", &POA_CORBA_InterfaceDef::_get_base_interfaces_skel}, - {"_set_base_interfaces", &POA_CORBA_InterfaceDef::_set_base_interfaces_skel}, + {"_get_containing_repository", &POA_CORBA_InterfaceDef::_get_containing_repository_skel}, + {"_get_id", &POA_CORBA_InterfaceDef::_get_id_skel}, + {"_set_id", &POA_CORBA_InterfaceDef::_set_id_skel}, + {"_get_def_kind", &POA_CORBA_InterfaceDef::_get_def_kind_skel}, + {"describe_contents", &POA_CORBA_InterfaceDef::describe_contents_skel}, + {"_get_base_interfaces", &POA_CORBA_InterfaceDef::_get_base_interfaces_skel}, + {"_set_base_interfaces", &POA_CORBA_InterfaceDef::_set_base_interfaces_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, 4, -8, -2, -10, -2, 5, -1, 6, 7, -78, - -13, -2, -79, 12, -1, -24, -3, -77, 15, -1, 16, 17, 18, 19, - 20, -1, 21, 22, -1, 23, -85, 27, 28, 29, 30, -32, -2, 31, - -73, 34, -1, 35, -1, -38, -2, 36, -1, 37, -75, -1, -1, -1, - -1, -1, 40, -1, -1, -1, 41, -1, -1, -1, -1, -1, -42, -2, - -72, + -1, -1, -1, -1, 4, -8, -2, -10, -2, 5, -1, 6, 7, -78, + -13, -2, -79, 12, -1, -24, -3, -77, 15, -1, 16, 17, 18, 19, + 20, -1, 21, 22, -1, 23, -85, 27, 28, 29, 30, -32, -2, 31, + -73, 34, -1, 35, -1, -38, -2, 36, -1, 37, -75, -1, -1, -1, + -1, -1, 40, -1, -1, -1, 41, -1, -1, -1, -1, -1, -42, -2, + -72, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -21579,7 +21595,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -21588,23 +21604,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -21615,7 +21631,7 @@ public: private: TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (const TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get &); void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get &); - + private: POA_CORBA_InterfaceDef *_tao_impl; CORBA_InterfaceDefSeq * _result; @@ -21639,7 +21655,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (CORBA:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -21651,11 +21667,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (CORBA: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -21664,11 +21680,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::Env CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -21690,7 +21706,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA_InterfaceDefSeq * result) { // Update the result. @@ -21705,7 +21721,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl , const CORBA_InterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -21714,37 +21730,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set (const TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set &); void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set &); - + private: POA_CORBA_InterfaceDef *_tao_impl; const CORBA_InterfaceDefSeq & base_interfaces_; - + }; TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set ( @@ -21767,16 +21783,16 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (CORBA:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->base_interfaces_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -21788,11 +21804,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (CORBA: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -21801,7 +21817,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (CORBA::Env CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -21831,7 +21847,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl , const char * interface_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -21840,23 +21856,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -21867,7 +21883,7 @@ public: private: TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a (const TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a &); void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a &); - + private: POA_CORBA_InterfaceDef *_tao_impl; const char * interface_id_; @@ -21894,16 +21910,16 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (CORBA::Environment &AC Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= interface_id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -21915,11 +21931,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (CORBA::Environment &A Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -21928,11 +21944,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Environment &ACE_T CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); 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 (); } @@ -21954,7 +21970,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Boolean result) { // Update the result. @@ -21968,7 +21984,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -21977,23 +21993,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -22004,7 +22020,7 @@ public: private: TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (const TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface &); void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface &); - + private: POA_CORBA_InterfaceDef *_tao_impl; CORBA_InterfaceDef::FullInterfaceDescription * _result; @@ -22028,7 +22044,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (CORBA::E Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -22040,11 +22056,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (CORBA:: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -22053,11 +22069,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::Envi CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -22079,7 +22095,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA_InterfaceDef::FullInterfaceDescription * result) { // Update the result. @@ -22098,7 +22114,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -22107,23 +22123,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -22134,7 +22150,7 @@ public: private: TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute (const TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute &); void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute &); - + private: POA_CORBA_InterfaceDef *_tao_impl; const char * id_; @@ -22173,12 +22189,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (CORBA::Env Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (5); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -22194,7 +22210,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (CORBA::Env (*parameter_list)[len].argument <<= this->mode_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -22206,11 +22222,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (CORBA::En Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -22219,11 +22235,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::Enviro CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -22245,7 +22261,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA_AttributeDef_ptr result) { // Update the result. @@ -22267,7 +22283,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -22276,23 +22292,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -22303,7 +22319,7 @@ public: private: TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation (const TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation &); void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation &); - + private: POA_CORBA_InterfaceDef *_tao_impl; const char * id_; @@ -22351,12 +22367,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (CORBA::Env Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (8); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -22381,7 +22397,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (CORBA::Env (*parameter_list)[len].argument <<= this->contexts_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -22393,11 +22409,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (CORBA::En Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -22406,11 +22422,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Enviro CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -22432,7 +22448,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA_OperationDef_ptr result) { // Update the result. @@ -22456,14 +22472,14 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::_TAO_CORBA_InterfaceDef_Strate { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_InterfaceDef_Proxy_Impl& @@ -22473,26 +22489,27 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -22505,7 +22522,7 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -22515,9 +22532,9 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -22537,13 +22554,13 @@ _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_Initializer)); @@ -22804,37 +22821,37 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( { POA_CORBA_InterfaceDef *_tao_impl = ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference); - + CORBA_InterfaceDefSeq_var _tao_retval; #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_CORBA_InterfaceDef_base_interfaces_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->base_interfaces ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -22851,11 +22868,11 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -22863,11 +22880,11 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( 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 ()) )) @@ -22875,7 +22892,7 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -22890,7 +22907,7 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_InterfaceDef *_tao_impl = ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_InterfaceDefSeq base_interfaces; if (!( @@ -22902,12 +22919,12 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel ( #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_CORBA_InterfaceDef_base_interfaces_set ri ( _tao_server_request, _tao_upcall, @@ -22915,20 +22932,20 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel ( base_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->base_interfaces ( base_interfaces, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -22942,11 +22959,11 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -22954,12 +22971,12 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -22974,7 +22991,7 @@ void POA_CORBA_InterfaceDef::is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_InterfaceDef *_tao_impl = ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference); - + CORBA::Boolean _tao_retval = 0; CORBA::String_var interface_id; if (!( @@ -22986,12 +23003,12 @@ void POA_CORBA_InterfaceDef::is_a_skel ( #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_CORBA_InterfaceDef_is_a ri ( _tao_server_request, _tao_upcall, @@ -22999,20 +23016,20 @@ void POA_CORBA_InterfaceDef::is_a_skel ( interface_id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_a ( interface_id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -23028,11 +23045,11 @@ void POA_CORBA_InterfaceDef::is_a_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -23040,11 +23057,11 @@ void POA_CORBA_InterfaceDef::is_a_skel ( 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)) )) @@ -23052,7 +23069,7 @@ void POA_CORBA_InterfaceDef::is_a_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -23066,37 +23083,37 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( { POA_CORBA_InterfaceDef *_tao_impl = ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference); - + CORBA_InterfaceDef::FullInterfaceDescription_var _tao_retval; #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_CORBA_InterfaceDef_describe_interface ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->describe_interface ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_InterfaceDef::FullInterfaceDescription * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -23113,11 +23130,11 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -23125,11 +23142,11 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( 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 ()) )) @@ -23137,7 +23154,7 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -23152,7 +23169,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_InterfaceDef *_tao_impl = ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference); - + CORBA_AttributeDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -23172,12 +23189,12 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( #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_CORBA_InterfaceDef_create_attribute ri ( _tao_server_request, _tao_upcall, @@ -23189,14 +23206,14 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( mode, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_attribute ( id.in (), name.in (), @@ -23206,7 +23223,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_AttributeDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -23223,11 +23240,11 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -23235,11 +23252,11 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( 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 ()) )) @@ -23247,7 +23264,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -23262,7 +23279,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_InterfaceDef *_tao_impl = ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference); - + CORBA_OperationDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -23288,12 +23305,12 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( #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_CORBA_InterfaceDef_create_operation ri ( _tao_server_request, _tao_upcall, @@ -23308,14 +23325,14 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( contexts, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_operation ( id.in (), name.in (), @@ -23328,7 +23345,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_OperationDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -23345,11 +23362,11 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -23357,11 +23374,11 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( 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 ()) )) @@ -23369,13 +23386,13 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_InterfaceDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -23387,10 +23404,10 @@ void POA_CORBA_InterfaceDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -23398,7 +23415,7 @@ void POA_CORBA_InterfaceDef::_is_a_skel ( } void POA_CORBA_InterfaceDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -23407,7 +23424,7 @@ void POA_CORBA_InterfaceDef::_non_existent_skel ( POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -23415,7 +23432,7 @@ void POA_CORBA_InterfaceDef::_non_existent_skel ( } void POA_CORBA_InterfaceDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -23424,26 +23441,26 @@ void POA_CORBA_InterfaceDef::_interface_skel ( POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -23455,7 +23472,7 @@ void POA_CORBA_InterfaceDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -23469,7 +23486,7 @@ CORBA::Boolean POA_CORBA_InterfaceDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || @@ -23520,20 +23537,20 @@ POA_CORBA_InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_InterfaceDef::_unchecked_narrow (obj.in ()); } @@ -23616,56 +23633,56 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_AbstractInterfaceDef::move_skel}, - {"is_a", &POA_CORBA_AbstractInterfaceDef::is_a_skel}, - {"create_enum", &POA_CORBA_AbstractInterfaceDef::create_enum_skel}, - {"create_value", &POA_CORBA_AbstractInterfaceDef::create_value_skel}, - {"create_module", &POA_CORBA_AbstractInterfaceDef::create_module_skel}, - {"create_native", &POA_CORBA_AbstractInterfaceDef::create_native_skel}, - {"create_attribute", &POA_CORBA_AbstractInterfaceDef::create_attribute_skel}, - {"create_interface", &POA_CORBA_AbstractInterfaceDef::create_interface_skel}, - {"create_union", &POA_CORBA_AbstractInterfaceDef::create_union_skel}, - {"create_operation", &POA_CORBA_AbstractInterfaceDef::create_operation_skel}, - {"create_exception", &POA_CORBA_AbstractInterfaceDef::create_exception_skel}, - {"create_local_interface", &POA_CORBA_AbstractInterfaceDef::create_local_interface_skel}, - {"create_struct", &POA_CORBA_AbstractInterfaceDef::create_struct_skel}, - {"create_abstract_interface", &POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel}, - {"create_constant", &POA_CORBA_AbstractInterfaceDef::create_constant_skel}, - {"destroy", &POA_CORBA_AbstractInterfaceDef::destroy_skel}, - {"describe", &POA_CORBA_AbstractInterfaceDef::describe_skel}, + {"move", &POA_CORBA_AbstractInterfaceDef::move_skel}, + {"is_a", &POA_CORBA_AbstractInterfaceDef::is_a_skel}, + {"create_enum", &POA_CORBA_AbstractInterfaceDef::create_enum_skel}, + {"create_value", &POA_CORBA_AbstractInterfaceDef::create_value_skel}, + {"create_module", &POA_CORBA_AbstractInterfaceDef::create_module_skel}, + {"create_native", &POA_CORBA_AbstractInterfaceDef::create_native_skel}, + {"create_attribute", &POA_CORBA_AbstractInterfaceDef::create_attribute_skel}, + {"create_interface", &POA_CORBA_AbstractInterfaceDef::create_interface_skel}, + {"create_union", &POA_CORBA_AbstractInterfaceDef::create_union_skel}, + {"create_operation", &POA_CORBA_AbstractInterfaceDef::create_operation_skel}, + {"create_exception", &POA_CORBA_AbstractInterfaceDef::create_exception_skel}, + {"create_local_interface", &POA_CORBA_AbstractInterfaceDef::create_local_interface_skel}, + {"create_struct", &POA_CORBA_AbstractInterfaceDef::create_struct_skel}, + {"create_abstract_interface", &POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel}, + {"create_constant", &POA_CORBA_AbstractInterfaceDef::create_constant_skel}, + {"destroy", &POA_CORBA_AbstractInterfaceDef::destroy_skel}, + {"describe", &POA_CORBA_AbstractInterfaceDef::describe_skel}, {"_is_a", &POA_CORBA_AbstractInterfaceDef::_is_a_skel}, - {"lookup_name", &POA_CORBA_AbstractInterfaceDef::lookup_name_skel}, - {"contents", &POA_CORBA_AbstractInterfaceDef::contents_skel}, - {"_get_name", &POA_CORBA_AbstractInterfaceDef::_get_name_skel}, - {"_get_type", &POA_CORBA_AbstractInterfaceDef::_get_type_skel}, - {"_set_name", &POA_CORBA_AbstractInterfaceDef::_set_name_skel}, + {"lookup_name", &POA_CORBA_AbstractInterfaceDef::lookup_name_skel}, + {"contents", &POA_CORBA_AbstractInterfaceDef::contents_skel}, + {"_get_name", &POA_CORBA_AbstractInterfaceDef::_get_name_skel}, + {"_get_type", &POA_CORBA_AbstractInterfaceDef::_get_type_skel}, + {"_set_name", &POA_CORBA_AbstractInterfaceDef::_set_name_skel}, {"_interface", &POA_CORBA_AbstractInterfaceDef::_interface_skel}, - {"create_value_box", &POA_CORBA_AbstractInterfaceDef::create_value_box_skel}, - {"create_alias", &POA_CORBA_AbstractInterfaceDef::create_alias_skel}, - {"describe_interface", &POA_CORBA_AbstractInterfaceDef::describe_interface_skel}, - {"lookup", &POA_CORBA_AbstractInterfaceDef::lookup_skel}, - {"_get_version", &POA_CORBA_AbstractInterfaceDef::_get_version_skel}, - {"_set_version", &POA_CORBA_AbstractInterfaceDef::_set_version_skel}, - {"_get_absolute_name", &POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel}, - {"_get_defined_in", &POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel}, + {"create_value_box", &POA_CORBA_AbstractInterfaceDef::create_value_box_skel}, + {"create_alias", &POA_CORBA_AbstractInterfaceDef::create_alias_skel}, + {"describe_interface", &POA_CORBA_AbstractInterfaceDef::describe_interface_skel}, + {"lookup", &POA_CORBA_AbstractInterfaceDef::lookup_skel}, + {"_get_version", &POA_CORBA_AbstractInterfaceDef::_get_version_skel}, + {"_set_version", &POA_CORBA_AbstractInterfaceDef::_set_version_skel}, + {"_get_absolute_name", &POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel}, + {"_get_defined_in", &POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel}, {"_non_existent", &POA_CORBA_AbstractInterfaceDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel}, - {"_get_id", &POA_CORBA_AbstractInterfaceDef::_get_id_skel}, - {"_set_id", &POA_CORBA_AbstractInterfaceDef::_set_id_skel}, - {"_get_def_kind", &POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel}, - {"describe_contents", &POA_CORBA_AbstractInterfaceDef::describe_contents_skel}, - {"_get_base_interfaces", &POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel}, - {"_set_base_interfaces", &POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel}, + {"_get_containing_repository", &POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel}, + {"_get_id", &POA_CORBA_AbstractInterfaceDef::_get_id_skel}, + {"_set_id", &POA_CORBA_AbstractInterfaceDef::_set_id_skel}, + {"_get_def_kind", &POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel}, + {"describe_contents", &POA_CORBA_AbstractInterfaceDef::describe_contents_skel}, + {"_get_base_interfaces", &POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel}, + {"_set_base_interfaces", &POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, 4, -8, -2, -10, -2, 5, -1, 6, 7, -78, - -13, -2, -79, 12, -1, -24, -3, -77, 15, -1, 16, 17, 18, 19, - 20, -1, 21, 22, -1, 23, -85, 27, 28, 29, 30, -32, -2, 31, - -73, 34, -1, 35, -1, -38, -2, 36, -1, 37, -75, -1, -1, -1, - -1, -1, 40, -1, -1, -1, 41, -1, -1, -1, -1, -1, -42, -2, - -72, + -1, -1, -1, -1, 4, -8, -2, -10, -2, 5, -1, 6, 7, -78, + -13, -2, -79, 12, -1, -24, -3, -77, 15, -1, 16, 17, 18, 19, + 20, -1, 21, 22, -1, 23, -85, 27, 28, 29, 30, -32, -2, 31, + -73, 34, -1, 35, -1, -38, -2, 36, -1, 37, -75, -1, -1, -1, + -1, -1, 40, -1, -1, -1, 41, -1, -1, -1, -1, -1, -42, -2, + -72, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -23720,14 +23737,14 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::_TAO_CORBA_AbstractInt { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl& @@ -23737,26 +23754,27 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -23769,7 +23787,7 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -23779,9 +23797,9 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -23801,13 +23819,13 @@ _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr int _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer)); @@ -23846,7 +23864,7 @@ POA_CORBA_AbstractInterfaceDef::~POA_CORBA_AbstractInterfaceDef (void) } void POA_CORBA_AbstractInterfaceDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -23858,10 +23876,10 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -23869,7 +23887,7 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel ( } void POA_CORBA_AbstractInterfaceDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -23878,7 +23896,7 @@ void POA_CORBA_AbstractInterfaceDef::_non_existent_skel ( POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -23886,7 +23904,7 @@ void POA_CORBA_AbstractInterfaceDef::_non_existent_skel ( } void POA_CORBA_AbstractInterfaceDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -23895,26 +23913,26 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel ( POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -23926,7 +23944,7 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -23940,7 +23958,7 @@ CORBA::Boolean POA_CORBA_AbstractInterfaceDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || @@ -23994,20 +24012,20 @@ POA_CORBA_AbstractInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_AbstractInterfaceDef::_unchecked_narrow (obj.in ()); } @@ -24090,56 +24108,56 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsig static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_LocalInterfaceDef::move_skel}, - {"is_a", &POA_CORBA_LocalInterfaceDef::is_a_skel}, - {"create_enum", &POA_CORBA_LocalInterfaceDef::create_enum_skel}, - {"create_value", &POA_CORBA_LocalInterfaceDef::create_value_skel}, - {"create_module", &POA_CORBA_LocalInterfaceDef::create_module_skel}, - {"create_native", &POA_CORBA_LocalInterfaceDef::create_native_skel}, - {"create_attribute", &POA_CORBA_LocalInterfaceDef::create_attribute_skel}, - {"create_interface", &POA_CORBA_LocalInterfaceDef::create_interface_skel}, - {"create_union", &POA_CORBA_LocalInterfaceDef::create_union_skel}, - {"create_operation", &POA_CORBA_LocalInterfaceDef::create_operation_skel}, - {"create_exception", &POA_CORBA_LocalInterfaceDef::create_exception_skel}, - {"create_local_interface", &POA_CORBA_LocalInterfaceDef::create_local_interface_skel}, - {"create_struct", &POA_CORBA_LocalInterfaceDef::create_struct_skel}, - {"create_abstract_interface", &POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel}, - {"create_constant", &POA_CORBA_LocalInterfaceDef::create_constant_skel}, - {"destroy", &POA_CORBA_LocalInterfaceDef::destroy_skel}, - {"describe", &POA_CORBA_LocalInterfaceDef::describe_skel}, + {"move", &POA_CORBA_LocalInterfaceDef::move_skel}, + {"is_a", &POA_CORBA_LocalInterfaceDef::is_a_skel}, + {"create_enum", &POA_CORBA_LocalInterfaceDef::create_enum_skel}, + {"create_value", &POA_CORBA_LocalInterfaceDef::create_value_skel}, + {"create_module", &POA_CORBA_LocalInterfaceDef::create_module_skel}, + {"create_native", &POA_CORBA_LocalInterfaceDef::create_native_skel}, + {"create_attribute", &POA_CORBA_LocalInterfaceDef::create_attribute_skel}, + {"create_interface", &POA_CORBA_LocalInterfaceDef::create_interface_skel}, + {"create_union", &POA_CORBA_LocalInterfaceDef::create_union_skel}, + {"create_operation", &POA_CORBA_LocalInterfaceDef::create_operation_skel}, + {"create_exception", &POA_CORBA_LocalInterfaceDef::create_exception_skel}, + {"create_local_interface", &POA_CORBA_LocalInterfaceDef::create_local_interface_skel}, + {"create_struct", &POA_CORBA_LocalInterfaceDef::create_struct_skel}, + {"create_abstract_interface", &POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel}, + {"create_constant", &POA_CORBA_LocalInterfaceDef::create_constant_skel}, + {"destroy", &POA_CORBA_LocalInterfaceDef::destroy_skel}, + {"describe", &POA_CORBA_LocalInterfaceDef::describe_skel}, {"_is_a", &POA_CORBA_LocalInterfaceDef::_is_a_skel}, - {"lookup_name", &POA_CORBA_LocalInterfaceDef::lookup_name_skel}, - {"contents", &POA_CORBA_LocalInterfaceDef::contents_skel}, - {"_get_name", &POA_CORBA_LocalInterfaceDef::_get_name_skel}, - {"_get_type", &POA_CORBA_LocalInterfaceDef::_get_type_skel}, - {"_set_name", &POA_CORBA_LocalInterfaceDef::_set_name_skel}, + {"lookup_name", &POA_CORBA_LocalInterfaceDef::lookup_name_skel}, + {"contents", &POA_CORBA_LocalInterfaceDef::contents_skel}, + {"_get_name", &POA_CORBA_LocalInterfaceDef::_get_name_skel}, + {"_get_type", &POA_CORBA_LocalInterfaceDef::_get_type_skel}, + {"_set_name", &POA_CORBA_LocalInterfaceDef::_set_name_skel}, {"_interface", &POA_CORBA_LocalInterfaceDef::_interface_skel}, - {"create_value_box", &POA_CORBA_LocalInterfaceDef::create_value_box_skel}, - {"create_alias", &POA_CORBA_LocalInterfaceDef::create_alias_skel}, - {"describe_interface", &POA_CORBA_LocalInterfaceDef::describe_interface_skel}, - {"lookup", &POA_CORBA_LocalInterfaceDef::lookup_skel}, - {"_get_version", &POA_CORBA_LocalInterfaceDef::_get_version_skel}, - {"_set_version", &POA_CORBA_LocalInterfaceDef::_set_version_skel}, - {"_get_absolute_name", &POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel}, - {"_get_defined_in", &POA_CORBA_LocalInterfaceDef::_get_defined_in_skel}, + {"create_value_box", &POA_CORBA_LocalInterfaceDef::create_value_box_skel}, + {"create_alias", &POA_CORBA_LocalInterfaceDef::create_alias_skel}, + {"describe_interface", &POA_CORBA_LocalInterfaceDef::describe_interface_skel}, + {"lookup", &POA_CORBA_LocalInterfaceDef::lookup_skel}, + {"_get_version", &POA_CORBA_LocalInterfaceDef::_get_version_skel}, + {"_set_version", &POA_CORBA_LocalInterfaceDef::_set_version_skel}, + {"_get_absolute_name", &POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel}, + {"_get_defined_in", &POA_CORBA_LocalInterfaceDef::_get_defined_in_skel}, {"_non_existent", &POA_CORBA_LocalInterfaceDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel}, - {"_get_id", &POA_CORBA_LocalInterfaceDef::_get_id_skel}, - {"_set_id", &POA_CORBA_LocalInterfaceDef::_set_id_skel}, - {"_get_def_kind", &POA_CORBA_LocalInterfaceDef::_get_def_kind_skel}, - {"describe_contents", &POA_CORBA_LocalInterfaceDef::describe_contents_skel}, - {"_get_base_interfaces", &POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel}, - {"_set_base_interfaces", &POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel}, + {"_get_containing_repository", &POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel}, + {"_get_id", &POA_CORBA_LocalInterfaceDef::_get_id_skel}, + {"_set_id", &POA_CORBA_LocalInterfaceDef::_set_id_skel}, + {"_get_def_kind", &POA_CORBA_LocalInterfaceDef::_get_def_kind_skel}, + {"describe_contents", &POA_CORBA_LocalInterfaceDef::describe_contents_skel}, + {"_get_base_interfaces", &POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel}, + {"_set_base_interfaces", &POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, 4, -8, -2, -10, -2, 5, -1, 6, 7, -78, - -13, -2, -79, 12, -1, -24, -3, -77, 15, -1, 16, 17, 18, 19, - 20, -1, 21, 22, -1, 23, -85, 27, 28, 29, 30, -32, -2, 31, - -73, 34, -1, 35, -1, -38, -2, 36, -1, 37, -75, -1, -1, -1, - -1, -1, 40, -1, -1, -1, 41, -1, -1, -1, -1, -1, -42, -2, - -72, + -1, -1, -1, -1, 4, -8, -2, -10, -2, 5, -1, 6, 7, -78, + -13, -2, -79, 12, -1, -24, -3, -77, 15, -1, 16, 17, 18, 19, + 20, -1, 21, 22, -1, 23, -85, 27, 28, 29, 30, -32, -2, 31, + -73, 34, -1, 35, -1, -38, -2, 36, -1, 37, -75, -1, -1, -1, + -1, -1, 40, -1, -1, -1, 41, -1, -1, -1, -1, -1, -42, -2, + -72, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -24194,14 +24212,14 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::_TAO_CORBA_LocalInterface { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_LocalInterfaceDef_Proxy_Impl& @@ -24211,26 +24229,27 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -24243,7 +24262,7 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -24253,9 +24272,9 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -24275,13 +24294,13 @@ _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr ob int _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_Initializer)); @@ -24320,7 +24339,7 @@ POA_CORBA_LocalInterfaceDef::~POA_CORBA_LocalInterfaceDef (void) } void POA_CORBA_LocalInterfaceDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -24332,10 +24351,10 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -24343,7 +24362,7 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel ( } void POA_CORBA_LocalInterfaceDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -24352,7 +24371,7 @@ void POA_CORBA_LocalInterfaceDef::_non_existent_skel ( POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -24360,7 +24379,7 @@ void POA_CORBA_LocalInterfaceDef::_non_existent_skel ( } void POA_CORBA_LocalInterfaceDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -24369,26 +24388,26 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel ( POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -24400,7 +24419,7 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -24414,7 +24433,7 @@ CORBA::Boolean POA_CORBA_LocalInterfaceDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || @@ -24468,20 +24487,20 @@ POA_CORBA_LocalInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_LocalInterfaceDef::_unchecked_narrow (obj.in ()); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp index e9206e42f99..6c4286a37a7 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp @@ -125,47 +125,47 @@ TAO_IR_ComponentRepository_Perfect_Hash_OpTable::lookup (const char *str, unsign static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0}, - {"contents", &POA_IR::ComponentRepository::contents_skel}, - {"create_enum", &POA_IR::ComponentRepository::create_enum_skel}, - {"create_alias", &POA_IR::ComponentRepository::create_alias_skel}, - {"create_value_box", &POA_IR::ComponentRepository::create_value_box_skel}, - {"create_struct", &POA_IR::ComponentRepository::create_struct_skel}, - {"create_constant", &POA_IR::ComponentRepository::create_constant_skel}, - {"create_component", &POA_IR::ComponentRepository::create_component_skel}, - {"create_string", &POA_IR::ComponentRepository::create_string_skel}, - {"create_wstring", &POA_IR::ComponentRepository::create_wstring_skel}, - {"create_home", &POA_IR::ComponentRepository::create_home_skel}, - {"create_value", &POA_IR::ComponentRepository::create_value_skel}, - {"create_module", &POA_IR::ComponentRepository::create_module_skel}, - {"create_native", &POA_IR::ComponentRepository::create_native_skel}, + {"contents", &POA_IR::ComponentRepository::contents_skel}, + {"create_enum", &POA_IR::ComponentRepository::create_enum_skel}, + {"create_alias", &POA_IR::ComponentRepository::create_alias_skel}, + {"create_value_box", &POA_IR::ComponentRepository::create_value_box_skel}, + {"create_struct", &POA_IR::ComponentRepository::create_struct_skel}, + {"create_constant", &POA_IR::ComponentRepository::create_constant_skel}, + {"create_component", &POA_IR::ComponentRepository::create_component_skel}, + {"create_string", &POA_IR::ComponentRepository::create_string_skel}, + {"create_wstring", &POA_IR::ComponentRepository::create_wstring_skel}, + {"create_home", &POA_IR::ComponentRepository::create_home_skel}, + {"create_value", &POA_IR::ComponentRepository::create_value_skel}, + {"create_module", &POA_IR::ComponentRepository::create_module_skel}, + {"create_native", &POA_IR::ComponentRepository::create_native_skel}, {"_non_existent", &POA_IR::ComponentRepository::_non_existent_skel}, - {"create_sequence", &POA_IR::ComponentRepository::create_sequence_skel}, - {"create_interface", &POA_IR::ComponentRepository::create_interface_skel}, - {"create_array", &POA_IR::ComponentRepository::create_array_skel}, + {"create_sequence", &POA_IR::ComponentRepository::create_sequence_skel}, + {"create_interface", &POA_IR::ComponentRepository::create_interface_skel}, + {"create_array", &POA_IR::ComponentRepository::create_array_skel}, {"_interface", &POA_IR::ComponentRepository::_interface_skel}, - {"create_local_interface", &POA_IR::ComponentRepository::create_local_interface_skel}, - {"get_primitive", &POA_IR::ComponentRepository::get_primitive_skel}, - {"create_abstract_interface", &POA_IR::ComponentRepository::create_abstract_interface_skel}, + {"create_local_interface", &POA_IR::ComponentRepository::create_local_interface_skel}, + {"get_primitive", &POA_IR::ComponentRepository::get_primitive_skel}, + {"create_abstract_interface", &POA_IR::ComponentRepository::create_abstract_interface_skel}, {"_is_a", &POA_IR::ComponentRepository::_is_a_skel}, - {"create_union", &POA_IR::ComponentRepository::create_union_skel}, - {"create_fixed", &POA_IR::ComponentRepository::create_fixed_skel}, - {"create_exception", &POA_IR::ComponentRepository::create_exception_skel}, - {"get_canonical_typecode", &POA_IR::ComponentRepository::get_canonical_typecode_skel}, - {"describe_contents", &POA_IR::ComponentRepository::describe_contents_skel}, - {"lookup_name", &POA_IR::ComponentRepository::lookup_name_skel}, - {"_get_def_kind", &POA_IR::ComponentRepository::_get_def_kind_skel}, - {"lookup", &POA_IR::ComponentRepository::lookup_skel}, - {"destroy", &POA_IR::ComponentRepository::destroy_skel}, - {"lookup_id", &POA_IR::ComponentRepository::lookup_id_skel}, + {"create_union", &POA_IR::ComponentRepository::create_union_skel}, + {"create_fixed", &POA_IR::ComponentRepository::create_fixed_skel}, + {"create_exception", &POA_IR::ComponentRepository::create_exception_skel}, + {"get_canonical_typecode", &POA_IR::ComponentRepository::get_canonical_typecode_skel}, + {"describe_contents", &POA_IR::ComponentRepository::describe_contents_skel}, + {"lookup_name", &POA_IR::ComponentRepository::lookup_name_skel}, + {"_get_def_kind", &POA_IR::ComponentRepository::_get_def_kind_skel}, + {"lookup", &POA_IR::ComponentRepository::lookup_skel}, + {"destroy", &POA_IR::ComponentRepository::destroy_skel}, + {"lookup_id", &POA_IR::ComponentRepository::lookup_id_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, 9, 10, -1, - -19, -2, 11, -1, 12, -1, 13, 14, -1, 15, 16, -1, 17, 18, - -79, 21, 22, 23, 24, -1, -1, -1, 25, 26, 27, -1, 28, 29, - 30, 31, -1, -1, 32, 33, 34, -1, -1, 35, -1, -1, -1, 36, - 37, -1, 38, -1, -1, -1, -1, -1, -1, 39, + -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, 9, 10, -1, + -19, -2, 11, -1, 12, -1, 13, 14, -1, 15, 16, -1, 17, 18, + -79, 21, 22, 23, 24, -1, -1, -1, 25, 26, 27, -1, 28, 29, + 30, 31, -1, -1, 32, 33, 34, -1, -1, 35, -1, -1, -1, 36, + 37, -1, 38, -1, -1, -1, -1, -1, -1, 39, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -215,7 +215,7 @@ public: const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -224,23 +224,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -251,7 +251,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentRepository_create_component (const TAO_ServerRequestInfo_IR_ComponentRepository_create_component &); void operator= (const TAO_ServerRequestInfo_IR_ComponentRepository_create_component &); - + private: POA_IR::ComponentRepository *_tao_impl; const char * id_; @@ -290,12 +290,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (5); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -311,7 +311,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA: (*parameter_list)[len].argument <<= this->supports_interfaces_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -323,11 +323,11 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -336,11 +336,11 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -362,7 +362,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (IR::ComponentDef_ptr result) { // Update the result. @@ -382,7 +382,7 @@ public: IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -391,23 +391,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -418,7 +418,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentRepository_create_home (const TAO_ServerRequestInfo_IR_ComponentRepository_create_home &); void operator= (const TAO_ServerRequestInfo_IR_ComponentRepository_create_home &); - + private: POA_IR::ComponentRepository *_tao_impl; const char * id_; @@ -460,12 +460,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Envi Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (6); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -484,7 +484,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Envi (*parameter_list)[len].argument <<= this->primary_key_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -496,11 +496,11 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Env Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -509,11 +509,11 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -535,7 +535,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (IR::HomeDef_ptr result) { // Update the result. @@ -559,14 +559,14 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::_TAO_ComponentReposit { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::~_TAO_ComponentRepository_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_ComponentRepository_Proxy_Impl& @@ -576,26 +576,27 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -608,7 +609,7 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -618,9 +619,9 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -640,13 +641,13 @@ IR__TAO_ComponentRepository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj int IR__TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer = + IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer = IR__TAO_ComponentRepository_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_ComponentRepository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_ComponentRepository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ComponentRepository_Proxy_Broker_Factory_Initializer)); @@ -776,7 +777,7 @@ void POA_IR::ComponentRepository::create_component_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::ComponentRepository *_tao_impl = ACE_static_cast (POA_IR::ComponentRepository *, _tao_object_reference); - + IR::ComponentDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -796,12 +797,12 @@ void POA_IR::ComponentRepository::create_component_skel ( #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_IR_ComponentRepository_create_component ri ( _tao_server_request, _tao_upcall, @@ -813,14 +814,14 @@ void POA_IR::ComponentRepository::create_component_skel ( supports_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_component ( id.in (), name.in (), @@ -830,7 +831,7 @@ void POA_IR::ComponentRepository::create_component_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -847,11 +848,11 @@ void POA_IR::ComponentRepository::create_component_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -859,11 +860,11 @@ void POA_IR::ComponentRepository::create_component_skel ( 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 ()) )) @@ -871,7 +872,7 @@ void POA_IR::ComponentRepository::create_component_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -886,7 +887,7 @@ void POA_IR::ComponentRepository::create_home_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::ComponentRepository *_tao_impl = ACE_static_cast (POA_IR::ComponentRepository *, _tao_object_reference); - + IR::HomeDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -908,12 +909,12 @@ void POA_IR::ComponentRepository::create_home_skel ( #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_IR_ComponentRepository_create_home ri ( _tao_server_request, _tao_upcall, @@ -926,14 +927,14 @@ void POA_IR::ComponentRepository::create_home_skel ( primary_key.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_home ( id.in (), name.in (), @@ -944,7 +945,7 @@ void POA_IR::ComponentRepository::create_home_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::HomeDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -961,11 +962,11 @@ void POA_IR::ComponentRepository::create_home_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -973,11 +974,11 @@ void POA_IR::ComponentRepository::create_home_skel ( 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 ()) )) @@ -985,13 +986,13 @@ void POA_IR::ComponentRepository::create_home_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_IR::ComponentRepository::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -1003,10 +1004,10 @@ void POA_IR::ComponentRepository::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -1014,7 +1015,7 @@ void POA_IR::ComponentRepository::_is_a_skel ( } void POA_IR::ComponentRepository::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -1023,7 +1024,7 @@ void POA_IR::ComponentRepository::_non_existent_skel ( POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -1031,7 +1032,7 @@ void POA_IR::ComponentRepository::_non_existent_skel ( } void POA_IR::ComponentRepository::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -1040,26 +1041,26 @@ void POA_IR::ComponentRepository::_interface_skel ( POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -1071,7 +1072,7 @@ void POA_IR::ComponentRepository::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -1085,7 +1086,7 @@ CORBA::Boolean POA_IR::ComponentRepository::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) || @@ -1133,20 +1134,20 @@ POA_IR::ComponentRepository::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::ComponentRepository::_unchecked_narrow (obj.in ()); } @@ -1229,30 +1230,30 @@ TAO_IR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_IR::ProvidesDef::move_skel}, + {"move", &POA_IR::ProvidesDef::move_skel}, {"_is_a", &POA_IR::ProvidesDef::_is_a_skel}, - {"_get_id", &POA_IR::ProvidesDef::_get_id_skel}, - {"_set_id", &POA_IR::ProvidesDef::_set_id_skel}, - {"describe", &POA_IR::ProvidesDef::describe_skel}, - {"_get_name", &POA_IR::ProvidesDef::_get_name_skel}, - {"_set_name", &POA_IR::ProvidesDef::_set_name_skel}, + {"_get_id", &POA_IR::ProvidesDef::_get_id_skel}, + {"_set_id", &POA_IR::ProvidesDef::_set_id_skel}, + {"describe", &POA_IR::ProvidesDef::describe_skel}, + {"_get_name", &POA_IR::ProvidesDef::_get_name_skel}, + {"_set_name", &POA_IR::ProvidesDef::_set_name_skel}, {"_interface", &POA_IR::ProvidesDef::_interface_skel}, - {"_get_version", &POA_IR::ProvidesDef::_get_version_skel}, - {"_set_version", &POA_IR::ProvidesDef::_set_version_skel}, - {"_get_def_kind", &POA_IR::ProvidesDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_IR::ProvidesDef::_get_defined_in_skel}, - {"destroy", &POA_IR::ProvidesDef::destroy_skel}, - {"_get_absolute_name", &POA_IR::ProvidesDef::_get_absolute_name_skel}, - {"_get_interface_type", &POA_IR::ProvidesDef::_get_interface_type_skel}, + {"_get_version", &POA_IR::ProvidesDef::_get_version_skel}, + {"_set_version", &POA_IR::ProvidesDef::_set_version_skel}, + {"_get_def_kind", &POA_IR::ProvidesDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_IR::ProvidesDef::_get_defined_in_skel}, + {"destroy", &POA_IR::ProvidesDef::destroy_skel}, + {"_get_absolute_name", &POA_IR::ProvidesDef::_get_absolute_name_skel}, + {"_get_interface_type", &POA_IR::ProvidesDef::_get_interface_type_skel}, {"_non_existent", &POA_IR::ProvidesDef::_non_existent_skel}, - {"_get_containing_repository", &POA_IR::ProvidesDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_IR::ProvidesDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -2, -12, -2, 4, 5, -1, 49, 8, -45, 11, -1, -46, 14, - -1, 15, -1, 16, 17, 18, -6, -2, -1, 19, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 20, + -9, -2, -12, -2, 4, 5, -1, 49, 8, -45, 11, -1, -46, 14, + -1, 15, -1, 16, 17, 18, -6, -2, -1, 19, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 20, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -1297,7 +1298,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ProvidesDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1306,23 +1307,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -1333,7 +1334,7 @@ public: private: TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (const TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get &); void operator= (const TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get &); - + private: POA_IR::ProvidesDef *_tao_impl; CORBA_InterfaceDef_ptr _result; @@ -1357,7 +1358,7 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -1369,11 +1370,11 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1382,11 +1383,11 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1408,7 +1409,7 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA_InterfaceDef_ptr result) { // Update the result. @@ -1432,14 +1433,14 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::_TAO_ProvidesDef_Strategized_ { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::~_TAO_ProvidesDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_ProvidesDef_Proxy_Impl& @@ -1449,26 +1450,27 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -1481,7 +1483,7 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -1491,9 +1493,9 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -1513,13 +1515,13 @@ IR__TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer = IR__TAO_ProvidesDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer)); @@ -1594,37 +1596,37 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( { POA_IR::ProvidesDef *_tao_impl = ACE_static_cast (POA_IR::ProvidesDef *, _tao_object_reference); - + CORBA_InterfaceDef_var _tao_retval; #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_IR_ProvidesDef_interface_type_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->interface_type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -1641,11 +1643,11 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -1653,11 +1655,11 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( 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 ()) )) @@ -1665,13 +1667,13 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_IR::ProvidesDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -1683,10 +1685,10 @@ void POA_IR::ProvidesDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -1694,7 +1696,7 @@ void POA_IR::ProvidesDef::_is_a_skel ( } void POA_IR::ProvidesDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -1703,7 +1705,7 @@ void POA_IR::ProvidesDef::_non_existent_skel ( POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -1711,7 +1713,7 @@ void POA_IR::ProvidesDef::_non_existent_skel ( } void POA_IR::ProvidesDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -1720,26 +1722,26 @@ void POA_IR::ProvidesDef::_interface_skel ( POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -1751,7 +1753,7 @@ void POA_IR::ProvidesDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -1765,7 +1767,7 @@ CORBA::Boolean POA_IR::ProvidesDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -1810,20 +1812,20 @@ POA_IR::ProvidesDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::ProvidesDef::_unchecked_narrow (obj.in ()); } @@ -1906,31 +1908,31 @@ TAO_IR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_IR::UsesDef::move_skel}, + {"move", &POA_IR::UsesDef::move_skel}, {"_is_a", &POA_IR::UsesDef::_is_a_skel}, - {"_get_id", &POA_IR::UsesDef::_get_id_skel}, - {"_set_id", &POA_IR::UsesDef::_set_id_skel}, - {"describe", &POA_IR::UsesDef::describe_skel}, - {"_get_name", &POA_IR::UsesDef::_get_name_skel}, - {"_set_name", &POA_IR::UsesDef::_set_name_skel}, + {"_get_id", &POA_IR::UsesDef::_get_id_skel}, + {"_set_id", &POA_IR::UsesDef::_set_id_skel}, + {"describe", &POA_IR::UsesDef::describe_skel}, + {"_get_name", &POA_IR::UsesDef::_get_name_skel}, + {"_set_name", &POA_IR::UsesDef::_set_name_skel}, {"_interface", &POA_IR::UsesDef::_interface_skel}, - {"_get_version", &POA_IR::UsesDef::_get_version_skel}, - {"_set_version", &POA_IR::UsesDef::_set_version_skel}, - {"_get_def_kind", &POA_IR::UsesDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_IR::UsesDef::_get_defined_in_skel}, - {"_get_is_multiple", &POA_IR::UsesDef::_get_is_multiple_skel}, - {"destroy", &POA_IR::UsesDef::destroy_skel}, - {"_get_absolute_name", &POA_IR::UsesDef::_get_absolute_name_skel}, - {"_get_interface_type", &POA_IR::UsesDef::_get_interface_type_skel}, + {"_get_version", &POA_IR::UsesDef::_get_version_skel}, + {"_set_version", &POA_IR::UsesDef::_set_version_skel}, + {"_get_def_kind", &POA_IR::UsesDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_IR::UsesDef::_get_defined_in_skel}, + {"_get_is_multiple", &POA_IR::UsesDef::_get_is_multiple_skel}, + {"destroy", &POA_IR::UsesDef::destroy_skel}, + {"_get_absolute_name", &POA_IR::UsesDef::_get_absolute_name_skel}, + {"_get_interface_type", &POA_IR::UsesDef::_get_interface_type_skel}, {"_non_existent", &POA_IR::UsesDef::_non_existent_skel}, - {"_get_containing_repository", &POA_IR::UsesDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_IR::UsesDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -2, -12, -2, 4, 5, -1, 49, 8, -45, 11, -1, -46, 14, - -1, 15, 16, 17, 18, 19, -6, -2, -1, 20, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 21, + -9, -2, -12, -2, 4, 5, -1, 49, 8, -45, 11, -1, -46, 14, + -1, 15, 16, 17, 18, 19, -6, -2, -1, 20, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 21, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -1975,7 +1977,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1984,23 +1986,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -2011,7 +2013,7 @@ public: private: TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (const TAO_ServerRequestInfo_IR_UsesDef_interface_type_get &); void operator= (const TAO_ServerRequestInfo_IR_UsesDef_interface_type_get &); - + private: POA_IR::UsesDef *_tao_impl; CORBA_InterfaceDef_ptr _result; @@ -2035,7 +2037,7 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2047,11 +2049,11 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2060,11 +2062,11 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2086,7 +2088,7 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA_InterfaceDef_ptr result) { // Update the result. @@ -2100,7 +2102,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2109,23 +2111,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -2136,7 +2138,7 @@ public: private: TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (const TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get &); void operator= (const TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get &); - + private: POA_IR::UsesDef *_tao_impl; CORBA::Boolean _result; @@ -2160,7 +2162,7 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2172,11 +2174,11 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2185,11 +2187,11 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &AC CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); 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 (); } @@ -2211,7 +2213,7 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result) { // Update the result. @@ -2235,14 +2237,14 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::_TAO_UsesDef_Strategized_Proxy_Br { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::~_TAO_UsesDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_UsesDef_Proxy_Impl& @@ -2252,26 +2254,27 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -2284,7 +2287,7 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -2294,9 +2297,9 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -2316,13 +2319,13 @@ IR__TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer = IR__TAO_UsesDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer)); @@ -2428,37 +2431,37 @@ void POA_IR::UsesDef::_get_interface_type_skel ( { POA_IR::UsesDef *_tao_impl = ACE_static_cast (POA_IR::UsesDef *, _tao_object_reference); - + CORBA_InterfaceDef_var _tao_retval; #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_IR_UsesDef_interface_type_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->interface_type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2475,11 +2478,11 @@ void POA_IR::UsesDef::_get_interface_type_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2487,11 +2490,11 @@ void POA_IR::UsesDef::_get_interface_type_skel ( 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 ()) )) @@ -2499,7 +2502,7 @@ void POA_IR::UsesDef::_get_interface_type_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2513,37 +2516,37 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( { POA_IR::UsesDef *_tao_impl = ACE_static_cast (POA_IR::UsesDef *, _tao_object_reference); - + CORBA::Boolean _tao_retval = 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_IR_UsesDef_is_multiple_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_multiple ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -2559,11 +2562,11 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2571,11 +2574,11 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( 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)) )) @@ -2583,13 +2586,13 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_IR::UsesDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2601,10 +2604,10 @@ void POA_IR::UsesDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -2612,7 +2615,7 @@ void POA_IR::UsesDef::_is_a_skel ( } void POA_IR::UsesDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2621,7 +2624,7 @@ void POA_IR::UsesDef::_non_existent_skel ( POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -2629,7 +2632,7 @@ void POA_IR::UsesDef::_non_existent_skel ( } void POA_IR::UsesDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2638,26 +2641,26 @@ void POA_IR::UsesDef::_interface_skel ( POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -2669,7 +2672,7 @@ void POA_IR::UsesDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -2683,7 +2686,7 @@ CORBA::Boolean POA_IR::UsesDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -2728,20 +2731,20 @@ POA_IR::UsesDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::UsesDef::_unchecked_narrow (obj.in ()); } @@ -2824,31 +2827,31 @@ TAO_IR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_IR::EventDef::move_skel}, + {"move", &POA_IR::EventDef::move_skel}, {"_is_a", &POA_IR::EventDef::_is_a_skel}, - {"_get_id", &POA_IR::EventDef::_get_id_skel}, - {"_set_id", &POA_IR::EventDef::_set_id_skel}, - {"describe", &POA_IR::EventDef::describe_skel}, - {"_get_name", &POA_IR::EventDef::_get_name_skel}, - {"_set_name", &POA_IR::EventDef::_set_name_skel}, + {"_get_id", &POA_IR::EventDef::_get_id_skel}, + {"_set_id", &POA_IR::EventDef::_set_id_skel}, + {"describe", &POA_IR::EventDef::describe_skel}, + {"_get_name", &POA_IR::EventDef::_get_name_skel}, + {"_set_name", &POA_IR::EventDef::_set_name_skel}, {"_interface", &POA_IR::EventDef::_interface_skel}, - {"_get_version", &POA_IR::EventDef::_get_version_skel}, - {"_set_version", &POA_IR::EventDef::_set_version_skel}, - {"_get_def_kind", &POA_IR::EventDef::_get_def_kind_skel}, - {"is_a", &POA_IR::EventDef::is_a_skel}, - {"_get_defined_in", &POA_IR::EventDef::_get_defined_in_skel}, - {"destroy", &POA_IR::EventDef::destroy_skel}, - {"_get_absolute_name", &POA_IR::EventDef::_get_absolute_name_skel}, - {"_get_event", &POA_IR::EventDef::_get_event_skel}, + {"_get_version", &POA_IR::EventDef::_get_version_skel}, + {"_set_version", &POA_IR::EventDef::_set_version_skel}, + {"_get_def_kind", &POA_IR::EventDef::_get_def_kind_skel}, + {"is_a", &POA_IR::EventDef::is_a_skel}, + {"_get_defined_in", &POA_IR::EventDef::_get_defined_in_skel}, + {"destroy", &POA_IR::EventDef::destroy_skel}, + {"_get_absolute_name", &POA_IR::EventDef::_get_absolute_name_skel}, + {"_get_event", &POA_IR::EventDef::_get_event_skel}, {"_non_existent", &POA_IR::EventDef::_non_existent_skel}, - {"_get_containing_repository", &POA_IR::EventDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_IR::EventDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -2, -12, -2, 4, 5, -1, 50, 8, -45, 11, -1, -46, 14, - 15, 16, -1, 17, 18, -1, 19, -6, -2, 20, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 21, + -9, -2, -12, -2, 4, 5, -1, 50, 8, -45, 11, -1, -46, 14, + 15, 16, -1, 17, 18, -1, 19, -6, -2, 20, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 21, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -2894,7 +2897,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl , const char * event_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2903,23 +2906,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -2930,7 +2933,7 @@ public: private: TAO_ServerRequestInfo_IR_EventDef_is_a (const TAO_ServerRequestInfo_IR_EventDef_is_a &); void operator= (const TAO_ServerRequestInfo_IR_EventDef_is_a &); - + private: POA_IR::EventDef *_tao_impl; const char * event_id_; @@ -2957,16 +2960,16 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_E Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= event_id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2978,11 +2981,11 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2991,11 +2994,11 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV) CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); 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 (); } @@ -3017,7 +3020,7 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Boolean result) { // Update the result. @@ -3031,7 +3034,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3040,23 +3043,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -3067,7 +3070,7 @@ public: private: TAO_ServerRequestInfo_IR_EventDef_event_get (const TAO_ServerRequestInfo_IR_EventDef_event_get &); void operator= (const TAO_ServerRequestInfo_IR_EventDef_event_get &); - + private: POA_IR::EventDef *_tao_impl; CORBA_ValueDef_ptr _result; @@ -3091,7 +3094,7 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -3103,11 +3106,11 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3116,11 +3119,11 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -3142,7 +3145,7 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA_ValueDef_ptr result) { // Update the result. @@ -3166,14 +3169,14 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::_TAO_EventDef_Strategized_Proxy_ { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::~_TAO_EventDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_EventDef_Proxy_Impl& @@ -3183,26 +3186,27 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -3215,7 +3219,7 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -3225,9 +3229,9 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -3247,13 +3251,13 @@ IR__TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_EventDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer = IR__TAO_EventDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_EventDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_EventDef_Proxy_Broker_Factory_Initializer)); @@ -3362,7 +3366,7 @@ void POA_IR::EventDef::is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::EventDef *_tao_impl = ACE_static_cast (POA_IR::EventDef *, _tao_object_reference); - + CORBA::Boolean _tao_retval = 0; CORBA::String_var event_id; if (!( @@ -3374,12 +3378,12 @@ void POA_IR::EventDef::is_a_skel ( #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_IR_EventDef_is_a ri ( _tao_server_request, _tao_upcall, @@ -3387,20 +3391,20 @@ void POA_IR::EventDef::is_a_skel ( event_id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_a ( event_id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -3416,11 +3420,11 @@ void POA_IR::EventDef::is_a_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3428,11 +3432,11 @@ void POA_IR::EventDef::is_a_skel ( 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)) )) @@ -3440,7 +3444,7 @@ void POA_IR::EventDef::is_a_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -3454,37 +3458,37 @@ void POA_IR::EventDef::_get_event_skel ( { POA_IR::EventDef *_tao_impl = ACE_static_cast (POA_IR::EventDef *, _tao_object_reference); - + CORBA_ValueDef_var _tao_retval; #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_IR_EventDef_event_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->event ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ValueDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -3501,11 +3505,11 @@ void POA_IR::EventDef::_get_event_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -3513,11 +3517,11 @@ void POA_IR::EventDef::_get_event_skel ( 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 ()) )) @@ -3525,13 +3529,13 @@ void POA_IR::EventDef::_get_event_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_IR::EventDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -3543,10 +3547,10 @@ void POA_IR::EventDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -3554,7 +3558,7 @@ void POA_IR::EventDef::_is_a_skel ( } void POA_IR::EventDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -3563,7 +3567,7 @@ void POA_IR::EventDef::_non_existent_skel ( POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -3571,7 +3575,7 @@ void POA_IR::EventDef::_non_existent_skel ( } void POA_IR::EventDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -3580,26 +3584,26 @@ void POA_IR::EventDef::_interface_skel ( POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -3611,7 +3615,7 @@ void POA_IR::EventDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -3625,7 +3629,7 @@ CORBA::Boolean POA_IR::EventDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -3670,20 +3674,20 @@ POA_IR::EventDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::EventDef::_unchecked_narrow (obj.in ()); } @@ -3766,31 +3770,31 @@ TAO_IR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_IR::EmitsDef::move_skel}, + {"move", &POA_IR::EmitsDef::move_skel}, {"_is_a", &POA_IR::EmitsDef::_is_a_skel}, - {"_get_id", &POA_IR::EmitsDef::_get_id_skel}, - {"_set_id", &POA_IR::EmitsDef::_set_id_skel}, - {"describe", &POA_IR::EmitsDef::describe_skel}, - {"_get_name", &POA_IR::EmitsDef::_get_name_skel}, - {"_set_name", &POA_IR::EmitsDef::_set_name_skel}, + {"_get_id", &POA_IR::EmitsDef::_get_id_skel}, + {"_set_id", &POA_IR::EmitsDef::_set_id_skel}, + {"describe", &POA_IR::EmitsDef::describe_skel}, + {"_get_name", &POA_IR::EmitsDef::_get_name_skel}, + {"_set_name", &POA_IR::EmitsDef::_set_name_skel}, {"_interface", &POA_IR::EmitsDef::_interface_skel}, - {"_get_version", &POA_IR::EmitsDef::_get_version_skel}, - {"_set_version", &POA_IR::EmitsDef::_set_version_skel}, - {"_get_def_kind", &POA_IR::EmitsDef::_get_def_kind_skel}, - {"is_a", &POA_IR::EmitsDef::is_a_skel}, - {"_get_defined_in", &POA_IR::EmitsDef::_get_defined_in_skel}, - {"destroy", &POA_IR::EmitsDef::destroy_skel}, - {"_get_absolute_name", &POA_IR::EmitsDef::_get_absolute_name_skel}, - {"_get_event", &POA_IR::EmitsDef::_get_event_skel}, + {"_get_version", &POA_IR::EmitsDef::_get_version_skel}, + {"_set_version", &POA_IR::EmitsDef::_set_version_skel}, + {"_get_def_kind", &POA_IR::EmitsDef::_get_def_kind_skel}, + {"is_a", &POA_IR::EmitsDef::is_a_skel}, + {"_get_defined_in", &POA_IR::EmitsDef::_get_defined_in_skel}, + {"destroy", &POA_IR::EmitsDef::destroy_skel}, + {"_get_absolute_name", &POA_IR::EmitsDef::_get_absolute_name_skel}, + {"_get_event", &POA_IR::EmitsDef::_get_event_skel}, {"_non_existent", &POA_IR::EmitsDef::_non_existent_skel}, - {"_get_containing_repository", &POA_IR::EmitsDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_IR::EmitsDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -2, -12, -2, 4, 5, -1, 50, 8, -45, 11, -1, -46, 14, - 15, 16, -1, 17, 18, -1, 19, -6, -2, 20, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 21, + -9, -2, -12, -2, 4, 5, -1, 50, 8, -45, 11, -1, -46, 14, + 15, 16, -1, 17, 18, -1, 19, -6, -2, 20, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 21, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -3845,14 +3849,14 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::_TAO_EmitsDef_Strategized_Proxy_ { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::~_TAO_EmitsDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_EmitsDef_Proxy_Impl& @@ -3862,26 +3866,27 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -3894,7 +3899,7 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -3904,9 +3909,9 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -3926,13 +3931,13 @@ IR__TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer = IR__TAO_EmitsDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer)); @@ -3969,7 +3974,7 @@ POA_IR::EmitsDef::~EmitsDef (void) } void POA_IR::EmitsDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -3981,10 +3986,10 @@ void POA_IR::EmitsDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -3992,7 +3997,7 @@ void POA_IR::EmitsDef::_is_a_skel ( } void POA_IR::EmitsDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4001,7 +4006,7 @@ void POA_IR::EmitsDef::_non_existent_skel ( POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -4009,7 +4014,7 @@ void POA_IR::EmitsDef::_non_existent_skel ( } void POA_IR::EmitsDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4018,26 +4023,26 @@ void POA_IR::EmitsDef::_interface_skel ( POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -4049,7 +4054,7 @@ void POA_IR::EmitsDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -4063,7 +4068,7 @@ CORBA::Boolean POA_IR::EmitsDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) || @@ -4111,20 +4116,20 @@ POA_IR::EmitsDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::EmitsDef::_unchecked_narrow (obj.in ()); } @@ -4207,31 +4212,31 @@ TAO_IR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_IR::PublishesDef::move_skel}, + {"move", &POA_IR::PublishesDef::move_skel}, {"_is_a", &POA_IR::PublishesDef::_is_a_skel}, - {"_get_id", &POA_IR::PublishesDef::_get_id_skel}, - {"_set_id", &POA_IR::PublishesDef::_set_id_skel}, - {"describe", &POA_IR::PublishesDef::describe_skel}, - {"_get_name", &POA_IR::PublishesDef::_get_name_skel}, - {"_set_name", &POA_IR::PublishesDef::_set_name_skel}, + {"_get_id", &POA_IR::PublishesDef::_get_id_skel}, + {"_set_id", &POA_IR::PublishesDef::_set_id_skel}, + {"describe", &POA_IR::PublishesDef::describe_skel}, + {"_get_name", &POA_IR::PublishesDef::_get_name_skel}, + {"_set_name", &POA_IR::PublishesDef::_set_name_skel}, {"_interface", &POA_IR::PublishesDef::_interface_skel}, - {"_get_version", &POA_IR::PublishesDef::_get_version_skel}, - {"_set_version", &POA_IR::PublishesDef::_set_version_skel}, - {"_get_def_kind", &POA_IR::PublishesDef::_get_def_kind_skel}, - {"is_a", &POA_IR::PublishesDef::is_a_skel}, - {"_get_defined_in", &POA_IR::PublishesDef::_get_defined_in_skel}, - {"destroy", &POA_IR::PublishesDef::destroy_skel}, - {"_get_absolute_name", &POA_IR::PublishesDef::_get_absolute_name_skel}, - {"_get_event", &POA_IR::PublishesDef::_get_event_skel}, + {"_get_version", &POA_IR::PublishesDef::_get_version_skel}, + {"_set_version", &POA_IR::PublishesDef::_set_version_skel}, + {"_get_def_kind", &POA_IR::PublishesDef::_get_def_kind_skel}, + {"is_a", &POA_IR::PublishesDef::is_a_skel}, + {"_get_defined_in", &POA_IR::PublishesDef::_get_defined_in_skel}, + {"destroy", &POA_IR::PublishesDef::destroy_skel}, + {"_get_absolute_name", &POA_IR::PublishesDef::_get_absolute_name_skel}, + {"_get_event", &POA_IR::PublishesDef::_get_event_skel}, {"_non_existent", &POA_IR::PublishesDef::_non_existent_skel}, - {"_get_containing_repository", &POA_IR::PublishesDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_IR::PublishesDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -2, -12, -2, 4, 5, -1, 50, 8, -45, 11, -1, -46, 14, - 15, 16, -1, 17, 18, -1, 19, -6, -2, 20, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 21, + -9, -2, -12, -2, 4, 5, -1, 50, 8, -45, 11, -1, -46, 14, + 15, 16, -1, 17, 18, -1, 19, -6, -2, 20, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 21, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -4286,14 +4291,14 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::_TAO_PublishesDef_Strategize { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::~_TAO_PublishesDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_PublishesDef_Proxy_Impl& @@ -4303,26 +4308,27 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -4335,7 +4341,7 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -4345,9 +4351,9 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -4367,13 +4373,13 @@ IR__TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer = IR__TAO_PublishesDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer)); @@ -4410,7 +4416,7 @@ POA_IR::PublishesDef::~PublishesDef (void) } void POA_IR::PublishesDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4422,10 +4428,10 @@ void POA_IR::PublishesDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -4433,7 +4439,7 @@ void POA_IR::PublishesDef::_is_a_skel ( } void POA_IR::PublishesDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4442,7 +4448,7 @@ void POA_IR::PublishesDef::_non_existent_skel ( POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -4450,7 +4456,7 @@ void POA_IR::PublishesDef::_non_existent_skel ( } void POA_IR::PublishesDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4459,26 +4465,26 @@ void POA_IR::PublishesDef::_interface_skel ( POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -4490,7 +4496,7 @@ void POA_IR::PublishesDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -4504,7 +4510,7 @@ CORBA::Boolean POA_IR::PublishesDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) || @@ -4552,20 +4558,20 @@ POA_IR::PublishesDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::PublishesDef::_unchecked_narrow (obj.in ()); } @@ -4648,31 +4654,31 @@ TAO_IR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_IR::ConsumesDef::move_skel}, + {"move", &POA_IR::ConsumesDef::move_skel}, {"_is_a", &POA_IR::ConsumesDef::_is_a_skel}, - {"_get_id", &POA_IR::ConsumesDef::_get_id_skel}, - {"_set_id", &POA_IR::ConsumesDef::_set_id_skel}, - {"describe", &POA_IR::ConsumesDef::describe_skel}, - {"_get_name", &POA_IR::ConsumesDef::_get_name_skel}, - {"_set_name", &POA_IR::ConsumesDef::_set_name_skel}, + {"_get_id", &POA_IR::ConsumesDef::_get_id_skel}, + {"_set_id", &POA_IR::ConsumesDef::_set_id_skel}, + {"describe", &POA_IR::ConsumesDef::describe_skel}, + {"_get_name", &POA_IR::ConsumesDef::_get_name_skel}, + {"_set_name", &POA_IR::ConsumesDef::_set_name_skel}, {"_interface", &POA_IR::ConsumesDef::_interface_skel}, - {"_get_version", &POA_IR::ConsumesDef::_get_version_skel}, - {"_set_version", &POA_IR::ConsumesDef::_set_version_skel}, - {"_get_def_kind", &POA_IR::ConsumesDef::_get_def_kind_skel}, - {"is_a", &POA_IR::ConsumesDef::is_a_skel}, - {"_get_defined_in", &POA_IR::ConsumesDef::_get_defined_in_skel}, - {"destroy", &POA_IR::ConsumesDef::destroy_skel}, - {"_get_absolute_name", &POA_IR::ConsumesDef::_get_absolute_name_skel}, - {"_get_event", &POA_IR::ConsumesDef::_get_event_skel}, + {"_get_version", &POA_IR::ConsumesDef::_get_version_skel}, + {"_set_version", &POA_IR::ConsumesDef::_set_version_skel}, + {"_get_def_kind", &POA_IR::ConsumesDef::_get_def_kind_skel}, + {"is_a", &POA_IR::ConsumesDef::is_a_skel}, + {"_get_defined_in", &POA_IR::ConsumesDef::_get_defined_in_skel}, + {"destroy", &POA_IR::ConsumesDef::destroy_skel}, + {"_get_absolute_name", &POA_IR::ConsumesDef::_get_absolute_name_skel}, + {"_get_event", &POA_IR::ConsumesDef::_get_event_skel}, {"_non_existent", &POA_IR::ConsumesDef::_non_existent_skel}, - {"_get_containing_repository", &POA_IR::ConsumesDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_IR::ConsumesDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -2, -12, -2, 4, 5, -1, 50, 8, -45, 11, -1, -46, 14, - 15, 16, -1, 17, 18, -1, 19, -6, -2, 20, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 21, + -9, -2, -12, -2, 4, 5, -1, 50, 8, -45, 11, -1, -46, 14, + 15, 16, -1, 17, 18, -1, 19, -6, -2, 20, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 21, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -4727,14 +4733,14 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::_TAO_ConsumesDef_Strategized_ { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::~_TAO_ConsumesDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_ConsumesDef_Proxy_Impl& @@ -4744,26 +4750,27 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -4776,7 +4783,7 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -4786,9 +4793,9 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -4808,13 +4815,13 @@ IR__TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer = IR__TAO_ConsumesDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer)); @@ -4851,7 +4858,7 @@ POA_IR::ConsumesDef::~ConsumesDef (void) } void POA_IR::ConsumesDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4863,10 +4870,10 @@ void POA_IR::ConsumesDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -4874,7 +4881,7 @@ void POA_IR::ConsumesDef::_is_a_skel ( } void POA_IR::ConsumesDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4883,7 +4890,7 @@ void POA_IR::ConsumesDef::_non_existent_skel ( POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -4891,7 +4898,7 @@ void POA_IR::ConsumesDef::_non_existent_skel ( } void POA_IR::ConsumesDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4900,26 +4907,26 @@ void POA_IR::ConsumesDef::_interface_skel ( POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -4931,7 +4938,7 @@ void POA_IR::ConsumesDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -4945,7 +4952,7 @@ CORBA::Boolean POA_IR::ConsumesDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) || @@ -4993,20 +5000,20 @@ POA_IR::ConsumesDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::ConsumesDef::_unchecked_narrow (obj.in ()); } @@ -5089,72 +5096,72 @@ TAO_IR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"is_a", &POA_IR::ComponentDef::is_a_skel}, + {"is_a", &POA_IR::ComponentDef::is_a_skel}, {"_is_a", &POA_IR::ComponentDef::_is_a_skel}, - {"lookup", &POA_IR::ComponentDef::lookup_skel}, - {"_get_emits_events", &POA_IR::ComponentDef::_get_emits_events_skel}, - {"_get_uses_interfaces", &POA_IR::ComponentDef::_get_uses_interfaces_skel}, - {"_set_base_interfaces", &POA_IR::ComponentDef::_set_base_interfaces_skel}, - {"_get_base_interfaces", &POA_IR::ComponentDef::_get_base_interfaces_skel}, - {"_get_consumes_events", &POA_IR::ComponentDef::_get_consumes_events_skel}, - {"_get_publishes_events", &POA_IR::ComponentDef::_get_publishes_events_skel}, - {"_get_provides_interfaces", &POA_IR::ComponentDef::_get_provides_interfaces_skel}, - {"_get_supported_interfaces", &POA_IR::ComponentDef::_get_supported_interfaces_skel}, - {"_set_supported_interfaces", &POA_IR::ComponentDef::_set_supported_interfaces_skel}, + {"lookup", &POA_IR::ComponentDef::lookup_skel}, + {"_get_emits_events", &POA_IR::ComponentDef::_get_emits_events_skel}, + {"_get_uses_interfaces", &POA_IR::ComponentDef::_get_uses_interfaces_skel}, + {"_set_base_interfaces", &POA_IR::ComponentDef::_set_base_interfaces_skel}, + {"_get_base_interfaces", &POA_IR::ComponentDef::_get_base_interfaces_skel}, + {"_get_consumes_events", &POA_IR::ComponentDef::_get_consumes_events_skel}, + {"_get_publishes_events", &POA_IR::ComponentDef::_get_publishes_events_skel}, + {"_get_provides_interfaces", &POA_IR::ComponentDef::_get_provides_interfaces_skel}, + {"_get_supported_interfaces", &POA_IR::ComponentDef::_get_supported_interfaces_skel}, + {"_set_supported_interfaces", &POA_IR::ComponentDef::_set_supported_interfaces_skel}, {"_non_existent", &POA_IR::ComponentDef::_non_existent_skel}, - {"_get_name", &POA_IR::ComponentDef::_get_name_skel}, - {"_get_type", &POA_IR::ComponentDef::_get_type_skel}, - {"_set_name", &POA_IR::ComponentDef::_set_name_skel}, + {"_get_name", &POA_IR::ComponentDef::_get_name_skel}, + {"_get_type", &POA_IR::ComponentDef::_get_type_skel}, + {"_set_name", &POA_IR::ComponentDef::_set_name_skel}, {"_interface", &POA_IR::ComponentDef::_interface_skel}, - {"_get_containing_repository", &POA_IR::ComponentDef::_get_containing_repository_skel}, - {"_get_base_component", &POA_IR::ComponentDef::_get_base_component_skel}, - {"lookup_name", &POA_IR::ComponentDef::lookup_name_skel}, - {"_get_id", &POA_IR::ComponentDef::_get_id_skel}, - {"_set_id", &POA_IR::ComponentDef::_set_id_skel}, - {"_get_absolute_name", &POA_IR::ComponentDef::_get_absolute_name_skel}, - {"move", &POA_IR::ComponentDef::move_skel}, - {"destroy", &POA_IR::ComponentDef::destroy_skel}, - {"_get_def_kind", &POA_IR::ComponentDef::_get_def_kind_skel}, - {"describe_contents", &POA_IR::ComponentDef::describe_contents_skel}, - {"_get_version", &POA_IR::ComponentDef::_get_version_skel}, - {"_set_version", &POA_IR::ComponentDef::_set_version_skel}, - {"_get_defined_in", &POA_IR::ComponentDef::_get_defined_in_skel}, - {"describe", &POA_IR::ComponentDef::describe_skel}, - {"contents", &POA_IR::ComponentDef::contents_skel}, - {"create_uses", &POA_IR::ComponentDef::create_uses_skel}, - {"create_emits", &POA_IR::ComponentDef::create_emits_skel}, - {"create_alias", &POA_IR::ComponentDef::create_alias_skel}, - {"_get_is_basic", &POA_IR::ComponentDef::_get_is_basic_skel}, - {"create_provides", &POA_IR::ComponentDef::create_provides_skel}, - {"create_consumes", &POA_IR::ComponentDef::create_consumes_skel}, - {"create_publishes", &POA_IR::ComponentDef::create_publishes_skel}, - {"describe_interface", &POA_IR::ComponentDef::describe_interface_skel}, - {"create_value_box", &POA_IR::ComponentDef::create_value_box_skel}, - {"create_enum", &POA_IR::ComponentDef::create_enum_skel}, - {"create_struct", &POA_IR::ComponentDef::create_struct_skel}, - {"create_constant", &POA_IR::ComponentDef::create_constant_skel}, - {"create_value", &POA_IR::ComponentDef::create_value_skel}, - {"create_module", &POA_IR::ComponentDef::create_module_skel}, - {"create_native", &POA_IR::ComponentDef::create_native_skel}, - {"create_attribute", &POA_IR::ComponentDef::create_attribute_skel}, - {"create_interface", &POA_IR::ComponentDef::create_interface_skel}, - {"create_local_interface", &POA_IR::ComponentDef::create_local_interface_skel}, - {"create_abstract_interface", &POA_IR::ComponentDef::create_abstract_interface_skel}, - {"create_union", &POA_IR::ComponentDef::create_union_skel}, - {"create_operation", &POA_IR::ComponentDef::create_operation_skel}, - {"create_exception", &POA_IR::ComponentDef::create_exception_skel}, + {"_get_containing_repository", &POA_IR::ComponentDef::_get_containing_repository_skel}, + {"_get_base_component", &POA_IR::ComponentDef::_get_base_component_skel}, + {"lookup_name", &POA_IR::ComponentDef::lookup_name_skel}, + {"_get_id", &POA_IR::ComponentDef::_get_id_skel}, + {"_set_id", &POA_IR::ComponentDef::_set_id_skel}, + {"_get_absolute_name", &POA_IR::ComponentDef::_get_absolute_name_skel}, + {"move", &POA_IR::ComponentDef::move_skel}, + {"destroy", &POA_IR::ComponentDef::destroy_skel}, + {"_get_def_kind", &POA_IR::ComponentDef::_get_def_kind_skel}, + {"describe_contents", &POA_IR::ComponentDef::describe_contents_skel}, + {"_get_version", &POA_IR::ComponentDef::_get_version_skel}, + {"_set_version", &POA_IR::ComponentDef::_set_version_skel}, + {"_get_defined_in", &POA_IR::ComponentDef::_get_defined_in_skel}, + {"describe", &POA_IR::ComponentDef::describe_skel}, + {"contents", &POA_IR::ComponentDef::contents_skel}, + {"create_uses", &POA_IR::ComponentDef::create_uses_skel}, + {"create_emits", &POA_IR::ComponentDef::create_emits_skel}, + {"create_alias", &POA_IR::ComponentDef::create_alias_skel}, + {"_get_is_basic", &POA_IR::ComponentDef::_get_is_basic_skel}, + {"create_provides", &POA_IR::ComponentDef::create_provides_skel}, + {"create_consumes", &POA_IR::ComponentDef::create_consumes_skel}, + {"create_publishes", &POA_IR::ComponentDef::create_publishes_skel}, + {"describe_interface", &POA_IR::ComponentDef::describe_interface_skel}, + {"create_value_box", &POA_IR::ComponentDef::create_value_box_skel}, + {"create_enum", &POA_IR::ComponentDef::create_enum_skel}, + {"create_struct", &POA_IR::ComponentDef::create_struct_skel}, + {"create_constant", &POA_IR::ComponentDef::create_constant_skel}, + {"create_value", &POA_IR::ComponentDef::create_value_skel}, + {"create_module", &POA_IR::ComponentDef::create_module_skel}, + {"create_native", &POA_IR::ComponentDef::create_native_skel}, + {"create_attribute", &POA_IR::ComponentDef::create_attribute_skel}, + {"create_interface", &POA_IR::ComponentDef::create_interface_skel}, + {"create_local_interface", &POA_IR::ComponentDef::create_local_interface_skel}, + {"create_abstract_interface", &POA_IR::ComponentDef::create_abstract_interface_skel}, + {"create_union", &POA_IR::ComponentDef::create_union_skel}, + {"create_operation", &POA_IR::ComponentDef::create_operation_skel}, + {"create_exception", &POA_IR::ComponentDef::create_exception_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, 4, 5, -1, -1, -1, -1, -1, 6, -1, -1, - -1, -1, -1, 7, -8, -4, -109, 12, -14, -2, 13, -110, -17, -3, - 16, -110, 20, 21, -24, -2, 22, -1, 23, -112, 26, 27, -1, -1, - 28, 29, -1, -1, -1, 30, -1, -1, -31, -2, -109, -1, -1, 33, - -37, -2, 34, 35, -40, -2, 36, -114, 39, -1, -113, 42, 43, -1, - -1, -1, 44, -1, -1, -49, -2, 45, -1, 46, -1, 47, -1, 48, - -116, -51, -2, -109, -1, -1, -1, -1, -1, 53, -1, -1, 54, -1, - -1, -1, -1, -1, -1, 55, -1, -56, -2, -109, + -1, -1, -1, -1, 4, 5, -1, -1, -1, -1, -1, 6, -1, -1, + -1, -1, -1, 7, -8, -4, -109, 12, -14, -2, 13, -110, -17, -3, + 16, -110, 20, 21, -24, -2, 22, -1, 23, -112, 26, 27, -1, -1, + 28, 29, -1, -1, -1, 30, -1, -1, -31, -2, -109, -1, -1, 33, + -37, -2, 34, 35, -40, -2, 36, -114, 39, -1, -113, 42, 43, -1, + -1, -1, 44, -1, -1, -49, -2, 45, -1, 46, -1, 47, -1, 48, + -116, -51, -2, -109, -1, -1, -1, -1, -1, 53, -1, -1, 54, -1, + -1, -1, -1, -1, -1, 55, -1, -56, -2, -109, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -5199,7 +5206,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5208,23 +5215,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5235,7 +5242,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get &); - + private: POA_IR::ComponentDef *_tao_impl; CORBA_InterfaceDefSeq * _result; @@ -5259,7 +5266,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -5271,11 +5278,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5284,11 +5291,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5310,7 +5317,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA_InterfaceDefSeq * result) { // Update the result. @@ -5325,7 +5332,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , const CORBA_InterfaceDefSeq & supported_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5334,37 +5341,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set &); - + private: POA_IR::ComponentDef *_tao_impl; const CORBA_InterfaceDefSeq & supported_interfaces_; - + }; TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set ( @@ -5387,16 +5394,16 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->supported_interfaces_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5408,11 +5415,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5421,7 +5428,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -5450,7 +5457,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5459,23 +5466,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5486,7 +5493,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (const TAO_ServerRequestInfo_IR_ComponentDef_base_component_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_base_component_get &); - + private: POA_IR::ComponentDef *_tao_impl; IR::ComponentDef_ptr _result; @@ -5510,7 +5517,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Envi Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -5522,11 +5529,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Env Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5535,11 +5542,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5561,7 +5568,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (IR::ComponentDef_ptr result) { // Update the result. @@ -5575,7 +5582,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5584,23 +5591,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5611,7 +5618,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get &); - + private: POA_IR::ComponentDef *_tao_impl; IR::ProvidesDefSeq * _result; @@ -5635,7 +5642,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -5647,11 +5654,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5660,11 +5667,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5686,7 +5693,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (IR::ProvidesDefSeq * result) { // Update the result. @@ -5700,7 +5707,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5709,23 +5716,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5736,7 +5743,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get &); - + private: POA_IR::ComponentDef *_tao_impl; IR::UsesDefSeq * _result; @@ -5760,7 +5767,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Env Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -5772,11 +5779,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::En Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5785,11 +5792,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Enviro CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5811,7 +5818,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (IR::UsesDefSeq * result) { // Update the result. @@ -5825,7 +5832,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5834,23 +5841,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5861,7 +5868,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get &); - + private: POA_IR::ComponentDef *_tao_impl; IR::EmitsDefSeq * _result; @@ -5885,7 +5892,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Enviro Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -5897,11 +5904,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Envir Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5910,11 +5917,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environme CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5936,7 +5943,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (IR::EmitsDefSeq * result) { // Update the result. @@ -5950,7 +5957,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5959,23 +5966,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5986,7 +5993,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get &); - + private: POA_IR::ComponentDef *_tao_impl; IR::PublishesDefSeq * _result; @@ -6010,7 +6017,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::En Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -6022,11 +6029,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::E Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6035,11 +6042,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Envir CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6061,7 +6068,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (IR::PublishesDefSeq * result) { // Update the result. @@ -6075,7 +6082,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6084,23 +6091,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6111,7 +6118,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get &); - + private: POA_IR::ComponentDef *_tao_impl; IR::ConsumesDefSeq * _result; @@ -6135,7 +6142,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Env Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -6147,11 +6154,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::En Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6160,11 +6167,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Enviro CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6186,7 +6193,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (IR::ConsumesDefSeq * result) { // Update the result. @@ -6200,7 +6207,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6209,23 +6216,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6236,7 +6243,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (const TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get &); - + private: POA_IR::ComponentDef *_tao_impl; CORBA::Boolean _result; @@ -6260,7 +6267,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environmen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -6272,11 +6279,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environme Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6285,11 +6292,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment & CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); 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 (); } @@ -6311,7 +6318,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result) { // Update the result. @@ -6329,7 +6336,7 @@ public: const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6338,23 +6345,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6365,7 +6372,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_create_provides (const TAO_ServerRequestInfo_IR_ComponentDef_create_provides &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_provides &); - + private: POA_IR::ComponentDef *_tao_impl; const char * id_; @@ -6401,12 +6408,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -6419,7 +6426,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environ (*parameter_list)[len].argument <<= this->interface_type_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6431,11 +6438,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6444,11 +6451,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6470,7 +6477,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (IR::ProvidesDef_ptr result) { // Update the result. @@ -6489,7 +6496,7 @@ public: const char * version, CORBA_InterfaceDef_ptr interface_type, const CORBA::Boolean & is_multiple, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6498,23 +6505,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6525,7 +6532,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_create_uses (const TAO_ServerRequestInfo_IR_ComponentDef_create_uses &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_uses &); - + private: POA_IR::ComponentDef *_tao_impl; const char * id_; @@ -6564,12 +6571,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (5); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -6585,7 +6592,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_multiple_); (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6597,11 +6604,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environmen Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6610,11 +6617,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &A CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6636,7 +6643,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (IR::UsesDef_ptr result) { // Update the result. @@ -6654,7 +6661,7 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6663,23 +6670,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6690,7 +6697,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_create_emits (const TAO_ServerRequestInfo_IR_ComponentDef_create_emits &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_emits &); - + private: POA_IR::ComponentDef *_tao_impl; const char * id_; @@ -6726,12 +6733,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environmen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -6744,7 +6751,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environmen (*parameter_list)[len].argument <<= this->value_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6756,11 +6763,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environme Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6769,11 +6776,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment & CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6795,7 +6802,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (IR::EmitsDef_ptr result) { // Update the result. @@ -6813,7 +6820,7 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6822,23 +6829,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -6849,7 +6856,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_create_publishes (const TAO_ServerRequestInfo_IR_ComponentDef_create_publishes &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_publishes &); - + private: POA_IR::ComponentDef *_tao_impl; const char * id_; @@ -6885,12 +6892,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Enviro Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -6903,7 +6910,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Enviro (*parameter_list)[len].argument <<= this->value_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -6915,11 +6922,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Envir Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6928,11 +6935,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environme CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6954,7 +6961,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (IR::PublishesDef_ptr result) { // Update the result. @@ -6972,7 +6979,7 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6981,23 +6988,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -7008,7 +7015,7 @@ public: private: TAO_ServerRequestInfo_IR_ComponentDef_create_consumes (const TAO_ServerRequestInfo_IR_ComponentDef_create_consumes &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_consumes &); - + private: POA_IR::ComponentDef *_tao_impl; const char * id_; @@ -7044,12 +7051,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -7062,7 +7069,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environ (*parameter_list)[len].argument <<= this->value_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -7074,11 +7081,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -7087,11 +7094,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -7113,7 +7120,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (IR::ConsumesDef_ptr result) { // Update the result. @@ -7137,14 +7144,14 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::_TAO_ComponentDef_Strategize { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::~_TAO_ComponentDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_ComponentDef_Proxy_Impl& @@ -7154,26 +7161,27 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -7186,7 +7194,7 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -7196,9 +7204,9 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -7218,13 +7226,13 @@ IR__TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer = IR__TAO_ComponentDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer)); @@ -7748,37 +7756,37 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( { POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + CORBA_InterfaceDefSeq_var _tao_retval; #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_IR_ComponentDef_supported_interfaces_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->supported_interfaces ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -7795,11 +7803,11 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7807,11 +7815,11 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( 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 ()) )) @@ -7819,7 +7827,7 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7834,7 +7842,7 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_InterfaceDefSeq supported_interfaces; if (!( @@ -7846,12 +7854,12 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( #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_IR_ComponentDef_supported_interfaces_set ri ( _tao_server_request, _tao_upcall, @@ -7859,20 +7867,20 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( supported_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->supported_interfaces ( supported_interfaces, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -7886,11 +7894,11 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7898,12 +7906,12 @@ void POA_IR::ComponentDef::_set_supported_interfaces_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7917,37 +7925,37 @@ void POA_IR::ComponentDef::_get_base_component_skel ( { POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::ComponentDef_var _tao_retval; #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_IR_ComponentDef_base_component_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->base_component ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -7964,11 +7972,11 @@ void POA_IR::ComponentDef::_get_base_component_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7976,11 +7984,11 @@ void POA_IR::ComponentDef::_get_base_component_skel ( 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 ()) )) @@ -7988,7 +7996,7 @@ void POA_IR::ComponentDef::_get_base_component_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8002,37 +8010,37 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( { POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::ProvidesDefSeq_var _tao_retval; #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_IR_ComponentDef_provides_interfaces_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->provides_interfaces ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::ProvidesDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8049,11 +8057,11 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8061,11 +8069,11 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( 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 ()) )) @@ -8073,7 +8081,7 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8087,37 +8095,37 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( { POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::UsesDefSeq_var _tao_retval; #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_IR_ComponentDef_uses_interfaces_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->uses_interfaces ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::UsesDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8134,11 +8142,11 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8146,11 +8154,11 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( 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 ()) )) @@ -8158,7 +8166,7 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8172,37 +8180,37 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( { POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::EmitsDefSeq_var _tao_retval; #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_IR_ComponentDef_emits_events_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->emits_events ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::EmitsDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8219,11 +8227,11 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8231,11 +8239,11 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( 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 ()) )) @@ -8243,7 +8251,7 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8257,37 +8265,37 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( { POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::PublishesDefSeq_var _tao_retval; #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_IR_ComponentDef_publishes_events_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->publishes_events ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::PublishesDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8304,11 +8312,11 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8316,11 +8324,11 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( 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 ()) )) @@ -8328,7 +8336,7 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8342,37 +8350,37 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( { POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::ConsumesDefSeq_var _tao_retval; #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_IR_ComponentDef_consumes_events_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->consumes_events ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::ConsumesDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8389,11 +8397,11 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8401,11 +8409,11 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( 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 ()) )) @@ -8413,7 +8421,7 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8427,37 +8435,37 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( { POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + CORBA::Boolean _tao_retval = 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_IR_ComponentDef_is_basic_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_basic ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -8473,11 +8481,11 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8485,11 +8493,11 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( 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)) )) @@ -8497,7 +8505,7 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8512,7 +8520,7 @@ void POA_IR::ComponentDef::create_provides_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::ProvidesDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8530,12 +8538,12 @@ void POA_IR::ComponentDef::create_provides_skel ( #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_IR_ComponentDef_create_provides ri ( _tao_server_request, _tao_upcall, @@ -8546,14 +8554,14 @@ void POA_IR::ComponentDef::create_provides_skel ( interface_type.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_provides ( id.in (), name.in (), @@ -8562,7 +8570,7 @@ void POA_IR::ComponentDef::create_provides_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::ProvidesDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8579,11 +8587,11 @@ void POA_IR::ComponentDef::create_provides_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8591,11 +8599,11 @@ void POA_IR::ComponentDef::create_provides_skel ( 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 ()) )) @@ -8603,7 +8611,7 @@ void POA_IR::ComponentDef::create_provides_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8618,7 +8626,7 @@ void POA_IR::ComponentDef::create_uses_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::UsesDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8638,12 +8646,12 @@ void POA_IR::ComponentDef::create_uses_skel ( #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_IR_ComponentDef_create_uses ri ( _tao_server_request, _tao_upcall, @@ -8655,14 +8663,14 @@ void POA_IR::ComponentDef::create_uses_skel ( is_multiple, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_uses ( id.in (), name.in (), @@ -8672,7 +8680,7 @@ void POA_IR::ComponentDef::create_uses_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::UsesDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8689,11 +8697,11 @@ void POA_IR::ComponentDef::create_uses_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8701,11 +8709,11 @@ void POA_IR::ComponentDef::create_uses_skel ( 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 ()) )) @@ -8713,7 +8721,7 @@ void POA_IR::ComponentDef::create_uses_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8728,7 +8736,7 @@ void POA_IR::ComponentDef::create_emits_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::EmitsDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8746,12 +8754,12 @@ void POA_IR::ComponentDef::create_emits_skel ( #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_IR_ComponentDef_create_emits ri ( _tao_server_request, _tao_upcall, @@ -8762,14 +8770,14 @@ void POA_IR::ComponentDef::create_emits_skel ( value.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_emits ( id.in (), name.in (), @@ -8778,7 +8786,7 @@ void POA_IR::ComponentDef::create_emits_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::EmitsDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8795,11 +8803,11 @@ void POA_IR::ComponentDef::create_emits_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8807,11 +8815,11 @@ void POA_IR::ComponentDef::create_emits_skel ( 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 ()) )) @@ -8819,7 +8827,7 @@ void POA_IR::ComponentDef::create_emits_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8834,7 +8842,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::PublishesDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8852,12 +8860,12 @@ void POA_IR::ComponentDef::create_publishes_skel ( #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_IR_ComponentDef_create_publishes ri ( _tao_server_request, _tao_upcall, @@ -8868,14 +8876,14 @@ void POA_IR::ComponentDef::create_publishes_skel ( value.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_publishes ( id.in (), name.in (), @@ -8884,7 +8892,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::PublishesDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8901,11 +8909,11 @@ void POA_IR::ComponentDef::create_publishes_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8913,11 +8921,11 @@ void POA_IR::ComponentDef::create_publishes_skel ( 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 ()) )) @@ -8925,7 +8933,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8940,7 +8948,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::ComponentDef *_tao_impl = ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference); - + IR::ConsumesDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8958,12 +8966,12 @@ void POA_IR::ComponentDef::create_consumes_skel ( #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_IR_ComponentDef_create_consumes ri ( _tao_server_request, _tao_upcall, @@ -8974,14 +8982,14 @@ void POA_IR::ComponentDef::create_consumes_skel ( value.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_consumes ( id.in (), name.in (), @@ -8990,7 +8998,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::ConsumesDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -9007,11 +9015,11 @@ void POA_IR::ComponentDef::create_consumes_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9019,11 +9027,11 @@ void POA_IR::ComponentDef::create_consumes_skel ( 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 ()) )) @@ -9031,13 +9039,13 @@ void POA_IR::ComponentDef::create_consumes_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_IR::ComponentDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9049,10 +9057,10 @@ void POA_IR::ComponentDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -9060,7 +9068,7 @@ void POA_IR::ComponentDef::_is_a_skel ( } void POA_IR::ComponentDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9069,7 +9077,7 @@ void POA_IR::ComponentDef::_non_existent_skel ( POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -9077,7 +9085,7 @@ void POA_IR::ComponentDef::_non_existent_skel ( } void POA_IR::ComponentDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9086,26 +9094,26 @@ void POA_IR::ComponentDef::_interface_skel ( POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -9117,7 +9125,7 @@ void POA_IR::ComponentDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -9131,7 +9139,7 @@ CORBA::Boolean POA_IR::ComponentDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || @@ -9185,20 +9193,20 @@ POA_IR::ComponentDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::ComponentDef::_unchecked_narrow (obj.in ()); } @@ -9281,31 +9289,31 @@ TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_IR::PrimaryKeyDef::move_skel}, + {"move", &POA_IR::PrimaryKeyDef::move_skel}, {"_is_a", &POA_IR::PrimaryKeyDef::_is_a_skel}, - {"_get_id", &POA_IR::PrimaryKeyDef::_get_id_skel}, - {"_set_id", &POA_IR::PrimaryKeyDef::_set_id_skel}, - {"describe", &POA_IR::PrimaryKeyDef::describe_skel}, - {"_get_name", &POA_IR::PrimaryKeyDef::_get_name_skel}, - {"_set_name", &POA_IR::PrimaryKeyDef::_set_name_skel}, + {"_get_id", &POA_IR::PrimaryKeyDef::_get_id_skel}, + {"_set_id", &POA_IR::PrimaryKeyDef::_set_id_skel}, + {"describe", &POA_IR::PrimaryKeyDef::describe_skel}, + {"_get_name", &POA_IR::PrimaryKeyDef::_get_name_skel}, + {"_set_name", &POA_IR::PrimaryKeyDef::_set_name_skel}, {"_interface", &POA_IR::PrimaryKeyDef::_interface_skel}, - {"destroy", &POA_IR::PrimaryKeyDef::destroy_skel}, - {"_get_def_kind", &POA_IR::PrimaryKeyDef::_get_def_kind_skel}, - {"is_a", &POA_IR::PrimaryKeyDef::is_a_skel}, - {"_get_version", &POA_IR::PrimaryKeyDef::_get_version_skel}, - {"_set_version", &POA_IR::PrimaryKeyDef::_set_version_skel}, - {"_get_absolute_name", &POA_IR::PrimaryKeyDef::_get_absolute_name_skel}, - {"_get_defined_in", &POA_IR::PrimaryKeyDef::_get_defined_in_skel}, - {"_get_primary_key", &POA_IR::PrimaryKeyDef::_get_primary_key_skel}, + {"destroy", &POA_IR::PrimaryKeyDef::destroy_skel}, + {"_get_def_kind", &POA_IR::PrimaryKeyDef::_get_def_kind_skel}, + {"is_a", &POA_IR::PrimaryKeyDef::is_a_skel}, + {"_get_version", &POA_IR::PrimaryKeyDef::_get_version_skel}, + {"_set_version", &POA_IR::PrimaryKeyDef::_set_version_skel}, + {"_get_absolute_name", &POA_IR::PrimaryKeyDef::_get_absolute_name_skel}, + {"_get_defined_in", &POA_IR::PrimaryKeyDef::_get_defined_in_skel}, + {"_get_primary_key", &POA_IR::PrimaryKeyDef::_get_primary_key_skel}, {"_non_existent", &POA_IR::PrimaryKeyDef::_non_existent_skel}, - {"_get_containing_repository", &POA_IR::PrimaryKeyDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_IR::PrimaryKeyDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -6, -2, -9, -2, 4, 5, -1, -38, 8, -38, 11, -1, 12, 13, - 14, -15, -2, -33, 17, -1, 18, 19, -1, 20, -1, -1, -1, -1, - -1, -1, -1, 21, + -6, -2, -9, -2, 4, 5, -1, -38, 8, -38, 11, -1, 12, 13, + 14, -15, -2, -33, 17, -1, 18, 19, -1, 20, -1, -1, -1, -1, + -1, -1, -1, 21, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -9351,7 +9359,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl , const char * primary_key_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -9360,23 +9368,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -9387,7 +9395,7 @@ public: private: TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a &); void operator= (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a &); - + private: POA_IR::PrimaryKeyDef *_tao_impl; const char * primary_key_id_; @@ -9414,16 +9422,16 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= primary_key_id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -9435,11 +9443,11 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9448,11 +9456,11 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); 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 (); } @@ -9474,7 +9482,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Boolean result) { // Update the result. @@ -9488,7 +9496,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -9497,23 +9505,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -9524,7 +9532,7 @@ public: private: TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get &); void operator= (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get &); - + private: POA_IR::PrimaryKeyDef *_tao_impl; CORBA_ValueDef_ptr _result; @@ -9548,7 +9556,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Enviro Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -9560,11 +9568,11 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Envir Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9573,11 +9581,11 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environme CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9599,7 +9607,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA_ValueDef_ptr result) { // Update the result. @@ -9623,14 +9631,14 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::_TAO_PrimaryKeyDef_Strategi { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_PrimaryKeyDef_Proxy_Impl& @@ -9640,26 +9648,27 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -9672,7 +9681,7 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -9682,9 +9691,9 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -9704,13 +9713,13 @@ IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer = IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_PrimaryKeyDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_PrimaryKeyDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer)); @@ -9819,7 +9828,7 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::PrimaryKeyDef *_tao_impl = ACE_static_cast (POA_IR::PrimaryKeyDef *, _tao_object_reference); - + CORBA::Boolean _tao_retval = 0; CORBA::String_var primary_key_id; if (!( @@ -9831,12 +9840,12 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( #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_IR_PrimaryKeyDef_is_a ri ( _tao_server_request, _tao_upcall, @@ -9844,20 +9853,20 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( primary_key_id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_a ( primary_key_id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -9873,11 +9882,11 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9885,11 +9894,11 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( 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)) )) @@ -9897,7 +9906,7 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -9911,37 +9920,37 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( { POA_IR::PrimaryKeyDef *_tao_impl = ACE_static_cast (POA_IR::PrimaryKeyDef *, _tao_object_reference); - + CORBA_ValueDef_var _tao_retval; #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_IR_PrimaryKeyDef_primary_key_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->primary_key ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ValueDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -9958,11 +9967,11 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9970,11 +9979,11 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( 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 ()) )) @@ -9982,13 +9991,13 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_IR::PrimaryKeyDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10000,10 +10009,10 @@ void POA_IR::PrimaryKeyDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -10011,7 +10020,7 @@ void POA_IR::PrimaryKeyDef::_is_a_skel ( } void POA_IR::PrimaryKeyDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10020,7 +10029,7 @@ void POA_IR::PrimaryKeyDef::_non_existent_skel ( POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -10028,7 +10037,7 @@ void POA_IR::PrimaryKeyDef::_non_existent_skel ( } void POA_IR::PrimaryKeyDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10037,26 +10046,26 @@ void POA_IR::PrimaryKeyDef::_interface_skel ( POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -10068,7 +10077,7 @@ void POA_IR::PrimaryKeyDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -10082,7 +10091,7 @@ CORBA::Boolean POA_IR::PrimaryKeyDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -10127,20 +10136,20 @@ POA_IR::PrimaryKeyDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::PrimaryKeyDef::_unchecked_narrow (obj.in ()); } @@ -10223,33 +10232,33 @@ TAO_IR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_IR::FactoryDef::move_skel}, + {"move", &POA_IR::FactoryDef::move_skel}, {"_is_a", &POA_IR::FactoryDef::_is_a_skel}, - {"_get_mode", &POA_IR::FactoryDef::_get_mode_skel}, - {"_set_name", &POA_IR::FactoryDef::_set_name_skel}, - {"_get_name", &POA_IR::FactoryDef::_get_name_skel}, - {"_set_mode", &POA_IR::FactoryDef::_set_mode_skel}, + {"_get_mode", &POA_IR::FactoryDef::_get_mode_skel}, + {"_set_name", &POA_IR::FactoryDef::_set_name_skel}, + {"_get_name", &POA_IR::FactoryDef::_get_name_skel}, + {"_set_mode", &POA_IR::FactoryDef::_set_mode_skel}, {"_interface", &POA_IR::FactoryDef::_interface_skel}, - {"_get_params", &POA_IR::FactoryDef::_get_params_skel}, - {"_set_params", &POA_IR::FactoryDef::_set_params_skel}, - {"_get_contexts", &POA_IR::FactoryDef::_get_contexts_skel}, - {"_set_contexts", &POA_IR::FactoryDef::_set_contexts_skel}, - {"_get_exceptions", &POA_IR::FactoryDef::_get_exceptions_skel}, - {"_set_exceptions", &POA_IR::FactoryDef::_set_exceptions_skel}, - {"_get_version", &POA_IR::FactoryDef::_get_version_skel}, - {"_set_version", &POA_IR::FactoryDef::_set_version_skel}, - {"_get_absolute_name", &POA_IR::FactoryDef::_get_absolute_name_skel}, - {"_get_defined_in", &POA_IR::FactoryDef::_get_defined_in_skel}, - {"_get_id", &POA_IR::FactoryDef::_get_id_skel}, - {"_set_id", &POA_IR::FactoryDef::_set_id_skel}, - {"describe", &POA_IR::FactoryDef::describe_skel}, - {"_get_result_def", &POA_IR::FactoryDef::_get_result_def_skel}, - {"_set_result_def", &POA_IR::FactoryDef::_set_result_def_skel}, - {"_get_def_kind", &POA_IR::FactoryDef::_get_def_kind_skel}, - {"_get_result", &POA_IR::FactoryDef::_get_result_skel}, - {"destroy", &POA_IR::FactoryDef::destroy_skel}, + {"_get_params", &POA_IR::FactoryDef::_get_params_skel}, + {"_set_params", &POA_IR::FactoryDef::_set_params_skel}, + {"_get_contexts", &POA_IR::FactoryDef::_get_contexts_skel}, + {"_set_contexts", &POA_IR::FactoryDef::_set_contexts_skel}, + {"_get_exceptions", &POA_IR::FactoryDef::_get_exceptions_skel}, + {"_set_exceptions", &POA_IR::FactoryDef::_set_exceptions_skel}, + {"_get_version", &POA_IR::FactoryDef::_get_version_skel}, + {"_set_version", &POA_IR::FactoryDef::_set_version_skel}, + {"_get_absolute_name", &POA_IR::FactoryDef::_get_absolute_name_skel}, + {"_get_defined_in", &POA_IR::FactoryDef::_get_defined_in_skel}, + {"_get_id", &POA_IR::FactoryDef::_get_id_skel}, + {"_set_id", &POA_IR::FactoryDef::_set_id_skel}, + {"describe", &POA_IR::FactoryDef::describe_skel}, + {"_get_result_def", &POA_IR::FactoryDef::_get_result_def_skel}, + {"_set_result_def", &POA_IR::FactoryDef::_set_result_def_skel}, + {"_get_def_kind", &POA_IR::FactoryDef::_get_def_kind_skel}, + {"_get_result", &POA_IR::FactoryDef::_get_result_skel}, + {"destroy", &POA_IR::FactoryDef::destroy_skel}, {"_non_existent", &POA_IR::FactoryDef::_non_existent_skel}, - {"_get_containing_repository", &POA_IR::FactoryDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_IR::FactoryDef::_get_containing_repository_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -10259,7 +10268,7 @@ TAO_IR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) { { - const class TAO_operation_db_entry *resword; + const class TAO_operation_db_entry *resword; switch (key) { @@ -10362,14 +10371,14 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::_TAO_FactoryDef_Strategized_Pr { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::~_TAO_FactoryDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_FactoryDef_Proxy_Impl& @@ -10379,26 +10388,27 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -10411,7 +10421,7 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -10421,9 +10431,9 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -10443,13 +10453,13 @@ IR__TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer = IR__TAO_FactoryDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer)); @@ -10486,7 +10496,7 @@ POA_IR::FactoryDef::~FactoryDef (void) } void POA_IR::FactoryDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10498,10 +10508,10 @@ void POA_IR::FactoryDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -10509,7 +10519,7 @@ void POA_IR::FactoryDef::_is_a_skel ( } void POA_IR::FactoryDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10518,7 +10528,7 @@ void POA_IR::FactoryDef::_non_existent_skel ( POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -10526,7 +10536,7 @@ void POA_IR::FactoryDef::_non_existent_skel ( } void POA_IR::FactoryDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10535,26 +10545,26 @@ void POA_IR::FactoryDef::_interface_skel ( POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -10566,7 +10576,7 @@ void POA_IR::FactoryDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -10580,7 +10590,7 @@ CORBA::Boolean POA_IR::FactoryDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) || @@ -10628,20 +10638,20 @@ POA_IR::FactoryDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::FactoryDef::_unchecked_narrow (obj.in ()); } @@ -10724,33 +10734,33 @@ TAO_IR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_IR::FinderDef::move_skel}, + {"move", &POA_IR::FinderDef::move_skel}, {"_is_a", &POA_IR::FinderDef::_is_a_skel}, - {"_get_mode", &POA_IR::FinderDef::_get_mode_skel}, - {"_set_name", &POA_IR::FinderDef::_set_name_skel}, - {"_get_name", &POA_IR::FinderDef::_get_name_skel}, - {"_set_mode", &POA_IR::FinderDef::_set_mode_skel}, + {"_get_mode", &POA_IR::FinderDef::_get_mode_skel}, + {"_set_name", &POA_IR::FinderDef::_set_name_skel}, + {"_get_name", &POA_IR::FinderDef::_get_name_skel}, + {"_set_mode", &POA_IR::FinderDef::_set_mode_skel}, {"_interface", &POA_IR::FinderDef::_interface_skel}, - {"_get_params", &POA_IR::FinderDef::_get_params_skel}, - {"_set_params", &POA_IR::FinderDef::_set_params_skel}, - {"_get_contexts", &POA_IR::FinderDef::_get_contexts_skel}, - {"_set_contexts", &POA_IR::FinderDef::_set_contexts_skel}, - {"_get_exceptions", &POA_IR::FinderDef::_get_exceptions_skel}, - {"_set_exceptions", &POA_IR::FinderDef::_set_exceptions_skel}, - {"_get_version", &POA_IR::FinderDef::_get_version_skel}, - {"_set_version", &POA_IR::FinderDef::_set_version_skel}, - {"_get_absolute_name", &POA_IR::FinderDef::_get_absolute_name_skel}, - {"_get_defined_in", &POA_IR::FinderDef::_get_defined_in_skel}, - {"_get_id", &POA_IR::FinderDef::_get_id_skel}, - {"_set_id", &POA_IR::FinderDef::_set_id_skel}, - {"describe", &POA_IR::FinderDef::describe_skel}, - {"_get_result_def", &POA_IR::FinderDef::_get_result_def_skel}, - {"_set_result_def", &POA_IR::FinderDef::_set_result_def_skel}, - {"_get_def_kind", &POA_IR::FinderDef::_get_def_kind_skel}, - {"_get_result", &POA_IR::FinderDef::_get_result_skel}, - {"destroy", &POA_IR::FinderDef::destroy_skel}, + {"_get_params", &POA_IR::FinderDef::_get_params_skel}, + {"_set_params", &POA_IR::FinderDef::_set_params_skel}, + {"_get_contexts", &POA_IR::FinderDef::_get_contexts_skel}, + {"_set_contexts", &POA_IR::FinderDef::_set_contexts_skel}, + {"_get_exceptions", &POA_IR::FinderDef::_get_exceptions_skel}, + {"_set_exceptions", &POA_IR::FinderDef::_set_exceptions_skel}, + {"_get_version", &POA_IR::FinderDef::_get_version_skel}, + {"_set_version", &POA_IR::FinderDef::_set_version_skel}, + {"_get_absolute_name", &POA_IR::FinderDef::_get_absolute_name_skel}, + {"_get_defined_in", &POA_IR::FinderDef::_get_defined_in_skel}, + {"_get_id", &POA_IR::FinderDef::_get_id_skel}, + {"_set_id", &POA_IR::FinderDef::_set_id_skel}, + {"describe", &POA_IR::FinderDef::describe_skel}, + {"_get_result_def", &POA_IR::FinderDef::_get_result_def_skel}, + {"_set_result_def", &POA_IR::FinderDef::_set_result_def_skel}, + {"_get_def_kind", &POA_IR::FinderDef::_get_def_kind_skel}, + {"_get_result", &POA_IR::FinderDef::_get_result_skel}, + {"destroy", &POA_IR::FinderDef::destroy_skel}, {"_non_existent", &POA_IR::FinderDef::_non_existent_skel}, - {"_get_containing_repository", &POA_IR::FinderDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_IR::FinderDef::_get_containing_repository_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -10760,7 +10770,7 @@ TAO_IR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) { { - const class TAO_operation_db_entry *resword; + const class TAO_operation_db_entry *resword; switch (key) { @@ -10863,14 +10873,14 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::_TAO_FinderDef_Strategized_Prox { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::~_TAO_FinderDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_FinderDef_Proxy_Impl& @@ -10880,26 +10890,27 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -10912,7 +10923,7 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -10922,9 +10933,9 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -10944,13 +10955,13 @@ IR__TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer = IR__TAO_FinderDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer)); @@ -10987,7 +10998,7 @@ POA_IR::FinderDef::~FinderDef (void) } void POA_IR::FinderDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -10999,10 +11010,10 @@ void POA_IR::FinderDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -11010,7 +11021,7 @@ void POA_IR::FinderDef::_is_a_skel ( } void POA_IR::FinderDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -11019,7 +11030,7 @@ void POA_IR::FinderDef::_non_existent_skel ( POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -11027,7 +11038,7 @@ void POA_IR::FinderDef::_non_existent_skel ( } void POA_IR::FinderDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -11036,26 +11047,26 @@ void POA_IR::FinderDef::_interface_skel ( POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -11067,7 +11078,7 @@ void POA_IR::FinderDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -11081,7 +11092,7 @@ CORBA::Boolean POA_IR::FinderDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) || @@ -11129,20 +11140,20 @@ POA_IR::FinderDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::FinderDef::_unchecked_narrow (obj.in ()); } @@ -11225,66 +11236,66 @@ TAO_IR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"is_a", &POA_IR::HomeDef::is_a_skel}, + {"is_a", &POA_IR::HomeDef::is_a_skel}, {"_is_a", &POA_IR::HomeDef::_is_a_skel}, - {"lookup", &POA_IR::HomeDef::lookup_skel}, - {"_get_id", &POA_IR::HomeDef::_get_id_skel}, - {"_set_id", &POA_IR::HomeDef::_set_id_skel}, - {"_get_version", &POA_IR::HomeDef::_get_version_skel}, - {"_set_version", &POA_IR::HomeDef::_set_version_skel}, - {"_get_def_kind", &POA_IR::HomeDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_IR::HomeDef::_get_defined_in_skel}, - {"create_enum", &POA_IR::HomeDef::create_enum_skel}, - {"_get_finders", &POA_IR::HomeDef::_get_finders_skel}, - {"_get_is_basic", &POA_IR::HomeDef::_get_is_basic_skel}, - {"_get_factories", &POA_IR::HomeDef::_get_factories_skel}, - {"create_value_box", &POA_IR::HomeDef::create_value_box_skel}, - {"create_union", &POA_IR::HomeDef::create_union_skel}, - {"create_finder", &POA_IR::HomeDef::create_finder_skel}, - {"_get_base_interfaces", &POA_IR::HomeDef::_get_base_interfaces_skel}, - {"_set_base_interfaces", &POA_IR::HomeDef::_set_base_interfaces_skel}, - {"create_operation", &POA_IR::HomeDef::create_operation_skel}, - {"create_exception", &POA_IR::HomeDef::create_exception_skel}, - {"describe_contents", &POA_IR::HomeDef::describe_contents_skel}, - {"move", &POA_IR::HomeDef::move_skel}, - {"contents", &POA_IR::HomeDef::contents_skel}, - {"_get_name", &POA_IR::HomeDef::_get_name_skel}, - {"_get_type", &POA_IR::HomeDef::_get_type_skel}, - {"_set_name", &POA_IR::HomeDef::_set_name_skel}, + {"lookup", &POA_IR::HomeDef::lookup_skel}, + {"_get_id", &POA_IR::HomeDef::_get_id_skel}, + {"_set_id", &POA_IR::HomeDef::_set_id_skel}, + {"_get_version", &POA_IR::HomeDef::_get_version_skel}, + {"_set_version", &POA_IR::HomeDef::_set_version_skel}, + {"_get_def_kind", &POA_IR::HomeDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_IR::HomeDef::_get_defined_in_skel}, + {"create_enum", &POA_IR::HomeDef::create_enum_skel}, + {"_get_finders", &POA_IR::HomeDef::_get_finders_skel}, + {"_get_is_basic", &POA_IR::HomeDef::_get_is_basic_skel}, + {"_get_factories", &POA_IR::HomeDef::_get_factories_skel}, + {"create_value_box", &POA_IR::HomeDef::create_value_box_skel}, + {"create_union", &POA_IR::HomeDef::create_union_skel}, + {"create_finder", &POA_IR::HomeDef::create_finder_skel}, + {"_get_base_interfaces", &POA_IR::HomeDef::_get_base_interfaces_skel}, + {"_set_base_interfaces", &POA_IR::HomeDef::_set_base_interfaces_skel}, + {"create_operation", &POA_IR::HomeDef::create_operation_skel}, + {"create_exception", &POA_IR::HomeDef::create_exception_skel}, + {"describe_contents", &POA_IR::HomeDef::describe_contents_skel}, + {"move", &POA_IR::HomeDef::move_skel}, + {"contents", &POA_IR::HomeDef::contents_skel}, + {"_get_name", &POA_IR::HomeDef::_get_name_skel}, + {"_get_type", &POA_IR::HomeDef::_get_type_skel}, + {"_set_name", &POA_IR::HomeDef::_set_name_skel}, {"_interface", &POA_IR::HomeDef::_interface_skel}, - {"lookup_name", &POA_IR::HomeDef::lookup_name_skel}, - {"create_alias", &POA_IR::HomeDef::create_alias_skel}, - {"describe", &POA_IR::HomeDef::describe_skel}, - {"_get_base_home", &POA_IR::HomeDef::_get_base_home_skel}, - {"destroy", &POA_IR::HomeDef::destroy_skel}, - {"_get_absolute_name", &POA_IR::HomeDef::_get_absolute_name_skel}, - {"_get_primary_key", &POA_IR::HomeDef::_get_primary_key_skel}, - {"describe_interface", &POA_IR::HomeDef::describe_interface_skel}, + {"lookup_name", &POA_IR::HomeDef::lookup_name_skel}, + {"create_alias", &POA_IR::HomeDef::create_alias_skel}, + {"describe", &POA_IR::HomeDef::describe_skel}, + {"_get_base_home", &POA_IR::HomeDef::_get_base_home_skel}, + {"destroy", &POA_IR::HomeDef::destroy_skel}, + {"_get_absolute_name", &POA_IR::HomeDef::_get_absolute_name_skel}, + {"_get_primary_key", &POA_IR::HomeDef::_get_primary_key_skel}, + {"describe_interface", &POA_IR::HomeDef::describe_interface_skel}, {"_non_existent", &POA_IR::HomeDef::_non_existent_skel}, - {"_get_containing_repository", &POA_IR::HomeDef::_get_containing_repository_skel}, - {"create_value", &POA_IR::HomeDef::create_value_skel}, - {"create_module", &POA_IR::HomeDef::create_module_skel}, - {"create_native", &POA_IR::HomeDef::create_native_skel}, - {"create_attribute", &POA_IR::HomeDef::create_attribute_skel}, - {"create_interface", &POA_IR::HomeDef::create_interface_skel}, - {"_get_managed_component", &POA_IR::HomeDef::_get_managed_component_skel}, - {"create_factory", &POA_IR::HomeDef::create_factory_skel}, - {"create_local_interface", &POA_IR::HomeDef::create_local_interface_skel}, - {"create_primary_key", &POA_IR::HomeDef::create_primary_key_skel}, - {"create_abstract_interface", &POA_IR::HomeDef::create_abstract_interface_skel}, - {"create_struct", &POA_IR::HomeDef::create_struct_skel}, - {"create_constant", &POA_IR::HomeDef::create_constant_skel}, + {"_get_containing_repository", &POA_IR::HomeDef::_get_containing_repository_skel}, + {"create_value", &POA_IR::HomeDef::create_value_skel}, + {"create_module", &POA_IR::HomeDef::create_module_skel}, + {"create_native", &POA_IR::HomeDef::create_native_skel}, + {"create_attribute", &POA_IR::HomeDef::create_attribute_skel}, + {"create_interface", &POA_IR::HomeDef::create_interface_skel}, + {"_get_managed_component", &POA_IR::HomeDef::_get_managed_component_skel}, + {"create_factory", &POA_IR::HomeDef::create_factory_skel}, + {"create_local_interface", &POA_IR::HomeDef::create_local_interface_skel}, + {"create_primary_key", &POA_IR::HomeDef::create_primary_key_skel}, + {"create_abstract_interface", &POA_IR::HomeDef::create_abstract_interface_skel}, + {"create_struct", &POA_IR::HomeDef::create_struct_skel}, + {"create_constant", &POA_IR::HomeDef::create_constant_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -1, 4, 5, 6, -1, -1, -1, -7, -2, -92, -1, - -1, -9, -2, -92, 11, -1, 12, -1, -1, -1, -1, -1, -1, -20, - -2, -22, -2, 13, 14, 15, 16, -1, 17, 18, 19, -1, -103, -102, - 24, -1, 25, -1, -27, -3, 26, -93, 30, 31, 32, 33, 34, -1, - -1, 35, 36, -1, -1, 37, -1, 38, -1, -1, -1, -1, 39, -42, - -2, 40, 41, -94, -44, -2, -92, 46, -1, 47, -1, -1, 48, 49, - -1, 50, -1, -1, 51, -1, 52, + -1, -1, -1, -1, 4, 5, 6, -1, -1, -1, -7, -2, -92, -1, + -1, -9, -2, -92, 11, -1, 12, -1, -1, -1, -1, -1, -1, -20, + -2, -22, -2, 13, 14, 15, 16, -1, 17, 18, 19, -1, -103, -102, + 24, -1, 25, -1, -27, -3, 26, -93, 30, 31, 32, 33, 34, -1, + -1, 35, 36, -1, -1, 37, -1, 38, -1, -1, -1, -1, 39, -42, + -2, 40, 41, -94, -44, -2, -92, 46, -1, 47, -1, -1, 48, 49, + -1, 50, -1, -1, 51, -1, 52, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -11329,7 +11340,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11338,23 +11349,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -11365,7 +11376,7 @@ public: private: TAO_ServerRequestInfo_IR_HomeDef_base_home_get (const TAO_ServerRequestInfo_IR_HomeDef_base_home_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_base_home_get &); - + private: POA_IR::HomeDef *_tao_impl; IR::HomeDef_ptr _result; @@ -11389,7 +11400,7 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -11401,11 +11412,11 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment & Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -11414,11 +11425,11 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -11440,7 +11451,7 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (IR::HomeDef_ptr result) { // Update the result. @@ -11454,7 +11465,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11463,23 +11474,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -11490,7 +11501,7 @@ public: private: TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (const TAO_ServerRequestInfo_IR_HomeDef_managed_component_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_managed_component_get &); - + private: POA_IR::HomeDef *_tao_impl; IR::ComponentDef_ptr _result; @@ -11514,7 +11525,7 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Enviro Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -11526,11 +11537,11 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Envir Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -11539,11 +11550,11 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environme CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -11565,7 +11576,7 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (IR::ComponentDef_ptr result) { // Update the result. @@ -11579,7 +11590,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11588,23 +11599,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -11615,7 +11626,7 @@ public: private: TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (const TAO_ServerRequestInfo_IR_HomeDef_primary_key_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_primary_key_get &); - + private: POA_IR::HomeDef *_tao_impl; IR::PrimaryKeyDef_ptr _result; @@ -11639,7 +11650,7 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -11651,11 +11662,11 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -11664,11 +11675,11 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &AC CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -11690,7 +11701,7 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (IR::PrimaryKeyDef_ptr result) { // Update the result. @@ -11704,7 +11715,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11713,23 +11724,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -11740,7 +11751,7 @@ public: private: TAO_ServerRequestInfo_IR_HomeDef_factories_get (const TAO_ServerRequestInfo_IR_HomeDef_factories_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_factories_get &); - + private: POA_IR::HomeDef *_tao_impl; IR::FactoryDefSeq * _result; @@ -11764,7 +11775,7 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -11776,11 +11787,11 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment & Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -11789,11 +11800,11 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -11815,7 +11826,7 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (IR::FactoryDefSeq * result) { // Update the result. @@ -11829,7 +11840,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11838,23 +11849,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -11865,7 +11876,7 @@ public: private: TAO_ServerRequestInfo_IR_HomeDef_finders_get (const TAO_ServerRequestInfo_IR_HomeDef_finders_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_finders_get &); - + private: POA_IR::HomeDef *_tao_impl; IR::FinderDefSeq * _result; @@ -11889,7 +11900,7 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -11901,11 +11912,11 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &AC Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -11914,11 +11925,11 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -11940,7 +11951,7 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (IR::FinderDefSeq * result) { // Update the result. @@ -11954,7 +11965,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11963,23 +11974,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -11990,7 +12001,7 @@ public: private: TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (const TAO_ServerRequestInfo_IR_HomeDef_is_basic_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_is_basic_get &); - + private: POA_IR::HomeDef *_tao_impl; CORBA::Boolean _result; @@ -12014,7 +12025,7 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &AC Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -12026,11 +12037,11 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &A Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12039,11 +12050,11 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_T CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); 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 (); } @@ -12065,7 +12076,7 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Boolean result) { // Update the result. @@ -12083,7 +12094,7 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr primary_key, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12092,23 +12103,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -12119,7 +12130,7 @@ public: private: TAO_ServerRequestInfo_IR_HomeDef_create_primary_key (const TAO_ServerRequestInfo_IR_HomeDef_create_primary_key &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_primary_key &); - + private: POA_IR::HomeDef *_tao_impl; const char * id_; @@ -12155,12 +12166,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (4); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -12173,7 +12184,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environme (*parameter_list)[len].argument <<= this->primary_key_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -12185,11 +12196,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12198,11 +12209,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -12224,7 +12235,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (IR::PrimaryKeyDef_ptr result) { // Update the result. @@ -12243,7 +12254,7 @@ public: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12252,23 +12263,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -12279,7 +12290,7 @@ public: private: TAO_ServerRequestInfo_IR_HomeDef_create_factory (const TAO_ServerRequestInfo_IR_HomeDef_create_factory &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_factory &); - + private: POA_IR::HomeDef *_tao_impl; const char * id_; @@ -12318,12 +12329,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment & Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (5); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -12339,7 +12350,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment & (*parameter_list)[len].argument <<= this->exceptions_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -12351,11 +12362,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12364,11 +12375,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -12390,7 +12401,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (IR::FactoryDef_ptr result) { // Update the result. @@ -12409,7 +12420,7 @@ public: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12418,23 +12429,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -12445,7 +12456,7 @@ public: private: TAO_ServerRequestInfo_IR_HomeDef_create_finder (const TAO_ServerRequestInfo_IR_HomeDef_create_finder &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_finder &); - + private: POA_IR::HomeDef *_tao_impl; const char * id_; @@ -12484,12 +12495,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (5); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -12505,7 +12516,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &A (*parameter_list)[len].argument <<= this->exceptions_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -12517,11 +12528,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment & Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12530,11 +12541,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -12556,7 +12567,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (IR::FinderDef_ptr result) { // Update the result. @@ -12580,14 +12591,14 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::_TAO_HomeDef_Strategized_Proxy_Br { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::~_TAO_HomeDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } IR::_TAO_HomeDef_Proxy_Impl& @@ -12597,26 +12608,27 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -12629,7 +12641,7 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -12639,9 +12651,9 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -12661,13 +12673,13 @@ IR__TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (long) { - IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer = + IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer = IR__TAO_HomeDef_Proxy_Broker_Factory_function; - + return 0; } -static int IR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int IR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer)); @@ -13021,37 +13033,37 @@ void POA_IR::HomeDef::_get_base_home_skel ( { POA_IR::HomeDef *_tao_impl = ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference); - + IR::HomeDef_var _tao_retval; #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_IR_HomeDef_base_home_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->base_home ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::HomeDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13068,11 +13080,11 @@ void POA_IR::HomeDef::_get_base_home_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13080,11 +13092,11 @@ void POA_IR::HomeDef::_get_base_home_skel ( 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 ()) )) @@ -13092,7 +13104,7 @@ void POA_IR::HomeDef::_get_base_home_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13106,37 +13118,37 @@ void POA_IR::HomeDef::_get_managed_component_skel ( { POA_IR::HomeDef *_tao_impl = ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference); - + IR::ComponentDef_var _tao_retval; #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_IR_HomeDef_managed_component_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->managed_component ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13153,11 +13165,11 @@ void POA_IR::HomeDef::_get_managed_component_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13165,11 +13177,11 @@ void POA_IR::HomeDef::_get_managed_component_skel ( 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 ()) )) @@ -13177,7 +13189,7 @@ void POA_IR::HomeDef::_get_managed_component_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13191,37 +13203,37 @@ void POA_IR::HomeDef::_get_primary_key_skel ( { POA_IR::HomeDef *_tao_impl = ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference); - + IR::PrimaryKeyDef_var _tao_retval; #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_IR_HomeDef_primary_key_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->primary_key ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13238,11 +13250,11 @@ void POA_IR::HomeDef::_get_primary_key_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13250,11 +13262,11 @@ void POA_IR::HomeDef::_get_primary_key_skel ( 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 ()) )) @@ -13262,7 +13274,7 @@ void POA_IR::HomeDef::_get_primary_key_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13276,37 +13288,37 @@ void POA_IR::HomeDef::_get_factories_skel ( { POA_IR::HomeDef *_tao_impl = ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference); - + IR::FactoryDefSeq_var _tao_retval; #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_IR_HomeDef_factories_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->factories ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::FactoryDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13323,11 +13335,11 @@ void POA_IR::HomeDef::_get_factories_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13335,11 +13347,11 @@ void POA_IR::HomeDef::_get_factories_skel ( 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 ()) )) @@ -13347,7 +13359,7 @@ void POA_IR::HomeDef::_get_factories_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13361,37 +13373,37 @@ void POA_IR::HomeDef::_get_finders_skel ( { POA_IR::HomeDef *_tao_impl = ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference); - + IR::FinderDefSeq_var _tao_retval; #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_IR_HomeDef_finders_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->finders ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::FinderDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13408,11 +13420,11 @@ void POA_IR::HomeDef::_get_finders_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13420,11 +13432,11 @@ void POA_IR::HomeDef::_get_finders_skel ( 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 ()) )) @@ -13432,7 +13444,7 @@ void POA_IR::HomeDef::_get_finders_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13446,37 +13458,37 @@ void POA_IR::HomeDef::_get_is_basic_skel ( { POA_IR::HomeDef *_tao_impl = ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference); - + CORBA::Boolean _tao_retval = 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_IR_HomeDef_is_basic_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_basic ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -13492,11 +13504,11 @@ void POA_IR::HomeDef::_get_is_basic_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13504,11 +13516,11 @@ void POA_IR::HomeDef::_get_is_basic_skel ( 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)) )) @@ -13516,7 +13528,7 @@ void POA_IR::HomeDef::_get_is_basic_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13531,7 +13543,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::HomeDef *_tao_impl = ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference); - + IR::PrimaryKeyDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -13549,12 +13561,12 @@ void POA_IR::HomeDef::create_primary_key_skel ( #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_IR_HomeDef_create_primary_key ri ( _tao_server_request, _tao_upcall, @@ -13565,14 +13577,14 @@ void POA_IR::HomeDef::create_primary_key_skel ( primary_key.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_primary_key ( id.in (), name.in (), @@ -13581,7 +13593,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13598,11 +13610,11 @@ void POA_IR::HomeDef::create_primary_key_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13610,11 +13622,11 @@ void POA_IR::HomeDef::create_primary_key_skel ( 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 ()) )) @@ -13622,7 +13634,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13637,7 +13649,7 @@ void POA_IR::HomeDef::create_factory_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::HomeDef *_tao_impl = ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference); - + IR::FactoryDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -13657,12 +13669,12 @@ void POA_IR::HomeDef::create_factory_skel ( #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_IR_HomeDef_create_factory ri ( _tao_server_request, _tao_upcall, @@ -13674,14 +13686,14 @@ void POA_IR::HomeDef::create_factory_skel ( exceptions, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_factory ( id.in (), name.in (), @@ -13691,7 +13703,7 @@ void POA_IR::HomeDef::create_factory_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::FactoryDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13708,11 +13720,11 @@ void POA_IR::HomeDef::create_factory_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13720,11 +13732,11 @@ void POA_IR::HomeDef::create_factory_skel ( 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 ()) )) @@ -13732,7 +13744,7 @@ void POA_IR::HomeDef::create_factory_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13747,7 +13759,7 @@ void POA_IR::HomeDef::create_finder_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_IR::HomeDef *_tao_impl = ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference); - + IR::FinderDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -13767,12 +13779,12 @@ void POA_IR::HomeDef::create_finder_skel ( #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_IR_HomeDef_create_finder ri ( _tao_server_request, _tao_upcall, @@ -13784,14 +13796,14 @@ void POA_IR::HomeDef::create_finder_skel ( exceptions, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_finder ( id.in (), name.in (), @@ -13801,7 +13813,7 @@ void POA_IR::HomeDef::create_finder_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR::FinderDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13818,11 +13830,11 @@ void POA_IR::HomeDef::create_finder_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -13830,11 +13842,11 @@ void POA_IR::HomeDef::create_finder_skel ( 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 ()) )) @@ -13842,13 +13854,13 @@ void POA_IR::HomeDef::create_finder_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_IR::HomeDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -13860,10 +13872,10 @@ void POA_IR::HomeDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -13871,7 +13883,7 @@ void POA_IR::HomeDef::_is_a_skel ( } void POA_IR::HomeDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -13880,7 +13892,7 @@ void POA_IR::HomeDef::_non_existent_skel ( POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -13888,7 +13900,7 @@ void POA_IR::HomeDef::_non_existent_skel ( } void POA_IR::HomeDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -13897,26 +13909,26 @@ void POA_IR::HomeDef::_interface_skel ( POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -13928,7 +13940,7 @@ void POA_IR::HomeDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -13942,7 +13954,7 @@ CORBA::Boolean POA_IR::HomeDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || @@ -13996,20 +14008,20 @@ POA_IR::HomeDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::IR::HomeDef::_unchecked_narrow (obj.in ()); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp index 77a4d44ceeb..90a4a6b7325 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp @@ -126,21 +126,21 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l { {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA_FixedDef::_is_a_skel}, - {"destroy", &POA_CORBA_FixedDef::destroy_skel}, - {"_get_type", &POA_CORBA_FixedDef::_get_type_skel}, - {"_get_scale", &POA_CORBA_FixedDef::_get_scale_skel}, + {"destroy", &POA_CORBA_FixedDef::destroy_skel}, + {"_get_type", &POA_CORBA_FixedDef::_get_type_skel}, + {"_get_scale", &POA_CORBA_FixedDef::_get_scale_skel}, {"_interface", &POA_CORBA_FixedDef::_interface_skel}, - {"_set_scale", &POA_CORBA_FixedDef::_set_scale_skel}, - {"_get_digits", &POA_CORBA_FixedDef::_get_digits_skel}, - {"_set_digits", &POA_CORBA_FixedDef::_set_digits_skel}, - {"_get_def_kind", &POA_CORBA_FixedDef::_get_def_kind_skel}, + {"_set_scale", &POA_CORBA_FixedDef::_set_scale_skel}, + {"_get_digits", &POA_CORBA_FixedDef::_get_digits_skel}, + {"_set_digits", &POA_CORBA_FixedDef::_set_digits_skel}, + {"_get_def_kind", &POA_CORBA_FixedDef::_get_def_kind_skel}, {"_non_existent", &POA_CORBA_FixedDef::_non_existent_skel}, }; static const signed char lookup[] = { - -1, -8, -3, -11, -2, 5, -1, 6, -1, 7, -27, -26, -1, 13, - -1, -1, -1, -1, 14, + -1, -8, -3, -11, -2, 5, -1, 6, -1, 7, -27, -26, -1, 13, + -1, -1, -1, -1, 14, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -185,7 +185,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -194,23 +194,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -221,7 +221,7 @@ public: private: TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (const TAO_ServerRequestInfo_CORBA_FixedDef_digits_get &); void operator= (const TAO_ServerRequestInfo_CORBA_FixedDef_digits_get &); - + private: POA_CORBA_FixedDef *_tao_impl; CORBA::UShort _result; @@ -245,7 +245,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (CORBA::Environment & Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -257,11 +257,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -270,11 +270,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::Environment &ACE CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -296,7 +296,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::UShort result) { // Update the result. @@ -311,7 +311,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl , const CORBA::UShort & digits, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -320,37 +320,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_FixedDef_digits_set (const TAO_ServerRequestInfo_CORBA_FixedDef_digits_set &); void operator= (const TAO_ServerRequestInfo_CORBA_FixedDef_digits_set &); - + private: POA_CORBA_FixedDef *_tao_impl; const CORBA::UShort & digits_; - + }; TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_FixedDef_digits_set ( @@ -373,16 +373,16 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (CORBA::Environment & Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= digits_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -394,11 +394,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (CORBA::Environment Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -407,7 +407,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (CORBA::Environment &ACE CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -436,7 +436,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -445,23 +445,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -472,7 +472,7 @@ public: private: TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (const TAO_ServerRequestInfo_CORBA_FixedDef_scale_get &); void operator= (const TAO_ServerRequestInfo_CORBA_FixedDef_scale_get &); - + private: POA_CORBA_FixedDef *_tao_impl; CORBA::Short _result; @@ -496,7 +496,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (CORBA::Environment &A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -508,11 +508,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (CORBA::Environment & Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -521,11 +521,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Environment &ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -547,7 +547,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Short result) { // Update the result. @@ -562,7 +562,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl , const CORBA::Short & scale, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -571,37 +571,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_FixedDef_scale_set (const TAO_ServerRequestInfo_CORBA_FixedDef_scale_set &); void operator= (const TAO_ServerRequestInfo_CORBA_FixedDef_scale_set &); - + private: POA_CORBA_FixedDef *_tao_impl; const CORBA::Short & scale_; - + }; TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_FixedDef_scale_set ( @@ -624,16 +624,16 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (CORBA::Environment &A Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= scale_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -645,11 +645,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (CORBA::Environment & Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -658,7 +658,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -697,14 +697,14 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::_TAO_CORBA_FixedDef_Strategized_Pr { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::~_TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_FixedDef_Proxy_Impl& @@ -714,26 +714,27 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -746,7 +747,7 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -756,9 +757,9 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -778,13 +779,13 @@ _TAO_CORBA_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_FixedDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_FixedDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_FixedDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_FixedDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_FixedDef_Proxy_Broker_Factory_Initializer)); @@ -954,37 +955,37 @@ void POA_CORBA_FixedDef::_get_digits_skel ( { POA_CORBA_FixedDef *_tao_impl = ACE_static_cast (POA_CORBA_FixedDef *, _tao_object_reference); - + CORBA::UShort _tao_retval = 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_CORBA_FixedDef_digits_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->digits ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::UShort _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -1000,11 +1001,11 @@ void POA_CORBA_FixedDef::_get_digits_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -1012,11 +1013,11 @@ void POA_CORBA_FixedDef::_get_digits_skel ( 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) )) @@ -1024,7 +1025,7 @@ void POA_CORBA_FixedDef::_get_digits_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -1039,7 +1040,7 @@ void POA_CORBA_FixedDef::_set_digits_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_FixedDef *_tao_impl = ACE_static_cast (POA_CORBA_FixedDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::UShort digits; if (!( @@ -1051,12 +1052,12 @@ void POA_CORBA_FixedDef::_set_digits_skel ( #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_CORBA_FixedDef_digits_set ri ( _tao_server_request, _tao_upcall, @@ -1064,20 +1065,20 @@ void POA_CORBA_FixedDef::_set_digits_skel ( digits, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->digits ( digits, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -1091,11 +1092,11 @@ void POA_CORBA_FixedDef::_set_digits_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -1103,12 +1104,12 @@ void POA_CORBA_FixedDef::_set_digits_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -1122,37 +1123,37 @@ void POA_CORBA_FixedDef::_get_scale_skel ( { POA_CORBA_FixedDef *_tao_impl = ACE_static_cast (POA_CORBA_FixedDef *, _tao_object_reference); - + CORBA::Short _tao_retval = 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_CORBA_FixedDef_scale_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->scale ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Short _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -1168,11 +1169,11 @@ void POA_CORBA_FixedDef::_get_scale_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -1180,11 +1181,11 @@ void POA_CORBA_FixedDef::_get_scale_skel ( 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) )) @@ -1192,7 +1193,7 @@ void POA_CORBA_FixedDef::_get_scale_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -1207,7 +1208,7 @@ void POA_CORBA_FixedDef::_set_scale_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_FixedDef *_tao_impl = ACE_static_cast (POA_CORBA_FixedDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::Short scale; if (!( @@ -1219,12 +1220,12 @@ void POA_CORBA_FixedDef::_set_scale_skel ( #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_CORBA_FixedDef_scale_set ri ( _tao_server_request, _tao_upcall, @@ -1232,20 +1233,20 @@ void POA_CORBA_FixedDef::_set_scale_skel ( scale, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->scale ( scale, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -1259,11 +1260,11 @@ void POA_CORBA_FixedDef::_set_scale_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -1271,18 +1272,18 @@ void POA_CORBA_FixedDef::_set_scale_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_FixedDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -1294,10 +1295,10 @@ void POA_CORBA_FixedDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -1305,7 +1306,7 @@ void POA_CORBA_FixedDef::_is_a_skel ( } void POA_CORBA_FixedDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -1314,7 +1315,7 @@ void POA_CORBA_FixedDef::_non_existent_skel ( POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -1322,7 +1323,7 @@ void POA_CORBA_FixedDef::_non_existent_skel ( } void POA_CORBA_FixedDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -1331,26 +1332,26 @@ void POA_CORBA_FixedDef::_interface_skel ( POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -1362,7 +1363,7 @@ void POA_CORBA_FixedDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -1376,7 +1377,7 @@ CORBA::Boolean POA_CORBA_FixedDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -1421,20 +1422,20 @@ POA_CORBA_FixedDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_FixedDef::_unchecked_narrow (obj.in ()); } @@ -1517,34 +1518,34 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_ValueMemberDef::move_skel}, + {"move", &POA_CORBA_ValueMemberDef::move_skel}, {"_is_a", &POA_CORBA_ValueMemberDef::_is_a_skel}, - {"_get_id", &POA_CORBA_ValueMemberDef::_get_id_skel}, - {"_set_id", &POA_CORBA_ValueMemberDef::_set_id_skel}, - {"describe", &POA_CORBA_ValueMemberDef::describe_skel}, - {"_get_type", &POA_CORBA_ValueMemberDef::_get_type_skel}, - {"_set_name", &POA_CORBA_ValueMemberDef::_set_name_skel}, - {"_get_name", &POA_CORBA_ValueMemberDef::_get_name_skel}, + {"_get_id", &POA_CORBA_ValueMemberDef::_get_id_skel}, + {"_set_id", &POA_CORBA_ValueMemberDef::_set_id_skel}, + {"describe", &POA_CORBA_ValueMemberDef::describe_skel}, + {"_get_type", &POA_CORBA_ValueMemberDef::_get_type_skel}, + {"_set_name", &POA_CORBA_ValueMemberDef::_set_name_skel}, + {"_get_name", &POA_CORBA_ValueMemberDef::_get_name_skel}, {"_interface", &POA_CORBA_ValueMemberDef::_interface_skel}, - {"_get_access", &POA_CORBA_ValueMemberDef::_get_access_skel}, - {"_set_access", &POA_CORBA_ValueMemberDef::_set_access_skel}, - {"_get_version", &POA_CORBA_ValueMemberDef::_get_version_skel}, - {"_set_version", &POA_CORBA_ValueMemberDef::_set_version_skel}, - {"_get_def_kind", &POA_CORBA_ValueMemberDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_CORBA_ValueMemberDef::_get_defined_in_skel}, - {"destroy", &POA_CORBA_ValueMemberDef::destroy_skel}, - {"_get_absolute_name", &POA_CORBA_ValueMemberDef::_get_absolute_name_skel}, - {"_get_type_def", &POA_CORBA_ValueMemberDef::_get_type_def_skel}, - {"_set_type_def", &POA_CORBA_ValueMemberDef::_set_type_def_skel}, + {"_get_access", &POA_CORBA_ValueMemberDef::_get_access_skel}, + {"_set_access", &POA_CORBA_ValueMemberDef::_set_access_skel}, + {"_get_version", &POA_CORBA_ValueMemberDef::_get_version_skel}, + {"_set_version", &POA_CORBA_ValueMemberDef::_set_version_skel}, + {"_get_def_kind", &POA_CORBA_ValueMemberDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_CORBA_ValueMemberDef::_get_defined_in_skel}, + {"destroy", &POA_CORBA_ValueMemberDef::destroy_skel}, + {"_get_absolute_name", &POA_CORBA_ValueMemberDef::_get_absolute_name_skel}, + {"_get_type_def", &POA_CORBA_ValueMemberDef::_get_type_def_skel}, + {"_set_type_def", &POA_CORBA_ValueMemberDef::_set_type_def_skel}, {"_non_existent", &POA_CORBA_ValueMemberDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_ValueMemberDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_CORBA_ValueMemberDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -13, -2, -15, -2, 4, 5, -1, 53, 8, 46, 12, -47, -46, 17, - -1, 18, -1, 19, 20, -9, -3, -21, -2, -38, -6, -2, -1, -1, - 23, -1, -1, -1, -1, -1, -1, -1, 24, + -13, -2, -15, -2, 4, 5, -1, 53, 8, 46, 12, -47, -46, 17, + -1, 18, -1, 19, 20, -9, -3, -21, -2, -38, -6, -2, -1, -1, + 23, -1, -1, -1, -1, -1, -1, -1, 24, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -1589,7 +1590,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1598,23 +1599,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -1625,7 +1626,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get &); - + private: POA_CORBA_ValueMemberDef *_tao_impl; CORBA::TypeCode_ptr _result; @@ -1649,7 +1650,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -1661,11 +1662,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1674,11 +1675,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1700,7 +1701,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -1714,7 +1715,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1723,23 +1724,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -1750,7 +1751,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get &); - + private: POA_CORBA_ValueMemberDef *_tao_impl; CORBA_IDLType_ptr _result; @@ -1774,7 +1775,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -1786,11 +1787,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1799,11 +1800,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -1825,7 +1826,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA_IDLType_ptr result) { // Update the result. @@ -1840,7 +1841,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl , CORBA_IDLType_ptr type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1849,37 +1850,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set &); - + private: POA_CORBA_ValueMemberDef *_tao_impl; CORBA_IDLType_ptr type_def_; - + }; TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set ( @@ -1902,16 +1903,16 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->type_def_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -1923,11 +1924,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1936,7 +1937,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -1965,7 +1966,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1974,23 +1975,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -2001,7 +2002,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get &); - + private: POA_CORBA_ValueMemberDef *_tao_impl; CORBA::Visibility _result; @@ -2025,7 +2026,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2037,11 +2038,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2050,11 +2051,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2076,7 +2077,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Visibility result) { // Update the result. @@ -2091,7 +2092,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl , const CORBA::Visibility & access, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2100,37 +2101,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set &); - + private: POA_CORBA_ValueMemberDef *_tao_impl; const CORBA::Visibility & access_; - + }; TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set ( @@ -2153,16 +2154,16 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= access_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -2174,11 +2175,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2187,7 +2188,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2226,14 +2227,14 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::_TAO_CORBA_ValueMemberDef_St { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_ValueMemberDef_Proxy_Impl& @@ -2243,26 +2244,27 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -2275,7 +2277,7 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -2285,9 +2287,9 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -2307,13 +2309,13 @@ _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_Initializer)); @@ -2514,37 +2516,37 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( { POA_CORBA_ValueMemberDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueMemberDef *, _tao_object_reference); - + CORBA::TypeCode_var _tao_retval; #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_CORBA_ValueMemberDef_type_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2561,11 +2563,11 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2573,11 +2575,11 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( 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 ()) )) @@ -2585,7 +2587,7 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2599,37 +2601,37 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( { POA_CORBA_ValueMemberDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueMemberDef *, _tao_object_reference); - + CORBA_IDLType_var _tao_retval; #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_CORBA_ValueMemberDef_type_def_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2646,11 +2648,11 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2658,11 +2660,11 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( 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 ()) )) @@ -2670,7 +2672,7 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2685,7 +2687,7 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueMemberDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueMemberDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_IDLType_var type_def; if (!( @@ -2697,12 +2699,12 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel ( #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_CORBA_ValueMemberDef_type_def_set ri ( _tao_server_request, _tao_upcall, @@ -2710,20 +2712,20 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel ( type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->type_def ( type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -2737,11 +2739,11 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2749,12 +2751,12 @@ void POA_CORBA_ValueMemberDef::_set_type_def_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2768,37 +2770,37 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( { POA_CORBA_ValueMemberDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueMemberDef *, _tao_object_reference); - + CORBA::Visibility _tao_retval = 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_CORBA_ValueMemberDef_access_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->access ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Visibility _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -2814,11 +2816,11 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2826,11 +2828,11 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( 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) )) @@ -2838,7 +2840,7 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2853,7 +2855,7 @@ void POA_CORBA_ValueMemberDef::_set_access_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueMemberDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueMemberDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::Visibility access; if (!( @@ -2865,12 +2867,12 @@ void POA_CORBA_ValueMemberDef::_set_access_skel ( #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_CORBA_ValueMemberDef_access_set ri ( _tao_server_request, _tao_upcall, @@ -2878,20 +2880,20 @@ void POA_CORBA_ValueMemberDef::_set_access_skel ( access, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->access ( access, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -2905,11 +2907,11 @@ void POA_CORBA_ValueMemberDef::_set_access_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -2917,18 +2919,18 @@ void POA_CORBA_ValueMemberDef::_set_access_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_ValueMemberDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2940,10 +2942,10 @@ void POA_CORBA_ValueMemberDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -2951,7 +2953,7 @@ void POA_CORBA_ValueMemberDef::_is_a_skel ( } void POA_CORBA_ValueMemberDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2960,7 +2962,7 @@ void POA_CORBA_ValueMemberDef::_non_existent_skel ( POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -2968,7 +2970,7 @@ void POA_CORBA_ValueMemberDef::_non_existent_skel ( } void POA_CORBA_ValueMemberDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -2977,26 +2979,26 @@ void POA_CORBA_ValueMemberDef::_interface_skel ( POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -3008,7 +3010,7 @@ void POA_CORBA_ValueMemberDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -3022,7 +3024,7 @@ CORBA::Boolean POA_CORBA_ValueMemberDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || @@ -3067,20 +3069,20 @@ POA_CORBA_ValueMemberDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_ValueMemberDef::_unchecked_narrow (obj.in ()); } @@ -3163,70 +3165,70 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_ValueDef::move_skel}, + {"move", &POA_CORBA_ValueDef::move_skel}, {"_is_a", &POA_CORBA_ValueDef::_is_a_skel}, - {"lookup", &POA_CORBA_ValueDef::lookup_skel}, - {"_get_name", &POA_CORBA_ValueDef::_get_name_skel}, - {"_get_type", &POA_CORBA_ValueDef::_get_type_skel}, - {"_set_name", &POA_CORBA_ValueDef::_set_name_skel}, + {"lookup", &POA_CORBA_ValueDef::lookup_skel}, + {"_get_name", &POA_CORBA_ValueDef::_get_name_skel}, + {"_get_type", &POA_CORBA_ValueDef::_get_type_skel}, + {"_set_name", &POA_CORBA_ValueDef::_set_name_skel}, {"_interface", &POA_CORBA_ValueDef::_interface_skel}, - {"lookup_name", &POA_CORBA_ValueDef::lookup_name_skel}, - {"_get_is_custom", &POA_CORBA_ValueDef::_get_is_custom_skel}, - {"_set_is_custom", &POA_CORBA_ValueDef::_set_is_custom_skel}, - {"_get_base_value", &POA_CORBA_ValueDef::_get_base_value_skel}, - {"_set_base_value", &POA_CORBA_ValueDef::_set_base_value_skel}, - {"_get_version", &POA_CORBA_ValueDef::_get_version_skel}, - {"_set_version", &POA_CORBA_ValueDef::_set_version_skel}, - {"_get_absolute_name", &POA_CORBA_ValueDef::_get_absolute_name_skel}, - {"_get_is_truncatable", &POA_CORBA_ValueDef::_get_is_truncatable_skel}, - {"_set_is_truncatable", &POA_CORBA_ValueDef::_set_is_truncatable_skel}, - {"_get_defined_in", &POA_CORBA_ValueDef::_get_defined_in_skel}, - {"is_a", &POA_CORBA_ValueDef::is_a_skel}, + {"lookup_name", &POA_CORBA_ValueDef::lookup_name_skel}, + {"_get_is_custom", &POA_CORBA_ValueDef::_get_is_custom_skel}, + {"_set_is_custom", &POA_CORBA_ValueDef::_set_is_custom_skel}, + {"_get_base_value", &POA_CORBA_ValueDef::_get_base_value_skel}, + {"_set_base_value", &POA_CORBA_ValueDef::_set_base_value_skel}, + {"_get_version", &POA_CORBA_ValueDef::_get_version_skel}, + {"_set_version", &POA_CORBA_ValueDef::_set_version_skel}, + {"_get_absolute_name", &POA_CORBA_ValueDef::_get_absolute_name_skel}, + {"_get_is_truncatable", &POA_CORBA_ValueDef::_get_is_truncatable_skel}, + {"_set_is_truncatable", &POA_CORBA_ValueDef::_set_is_truncatable_skel}, + {"_get_defined_in", &POA_CORBA_ValueDef::_get_defined_in_skel}, + {"is_a", &POA_CORBA_ValueDef::is_a_skel}, {"_non_existent", &POA_CORBA_ValueDef::_non_existent_skel}, - {"_get_is_abstract", &POA_CORBA_ValueDef::_get_is_abstract_skel}, - {"_set_is_abstract", &POA_CORBA_ValueDef::_set_is_abstract_skel}, - {"_get_initializers", &POA_CORBA_ValueDef::_get_initializers_skel}, - {"_set_initializers", &POA_CORBA_ValueDef::_set_initializers_skel}, - {"_get_containing_repository", &POA_CORBA_ValueDef::_get_containing_repository_skel}, - {"_get_id", &POA_CORBA_ValueDef::_get_id_skel}, - {"_set_id", &POA_CORBA_ValueDef::_set_id_skel}, - {"describe", &POA_CORBA_ValueDef::describe_skel}, - {"_get_supported_interfaces", &POA_CORBA_ValueDef::_get_supported_interfaces_skel}, - {"_set_abstract_base_values", &POA_CORBA_ValueDef::_set_abstract_base_values_skel}, - {"_get_abstract_base_values", &POA_CORBA_ValueDef::_get_abstract_base_values_skel}, - {"_set_supported_interfaces", &POA_CORBA_ValueDef::_set_supported_interfaces_skel}, - {"_get_def_kind", &POA_CORBA_ValueDef::_get_def_kind_skel}, - {"describe_value", &POA_CORBA_ValueDef::describe_value_skel}, - {"destroy", &POA_CORBA_ValueDef::destroy_skel}, - {"describe_contents", &POA_CORBA_ValueDef::describe_contents_skel}, - {"create_enum", &POA_CORBA_ValueDef::create_enum_skel}, - {"create_value", &POA_CORBA_ValueDef::create_value_skel}, - {"create_module", &POA_CORBA_ValueDef::create_module_skel}, - {"create_native", &POA_CORBA_ValueDef::create_native_skel}, - {"create_attribute", &POA_CORBA_ValueDef::create_attribute_skel}, - {"create_interface", &POA_CORBA_ValueDef::create_interface_skel}, - {"create_union", &POA_CORBA_ValueDef::create_union_skel}, - {"create_value_member", &POA_CORBA_ValueDef::create_value_member_skel}, - {"create_operation", &POA_CORBA_ValueDef::create_operation_skel}, - {"create_exception", &POA_CORBA_ValueDef::create_exception_skel}, - {"create_local_interface", &POA_CORBA_ValueDef::create_local_interface_skel}, - {"contents", &POA_CORBA_ValueDef::contents_skel}, - {"create_abstract_interface", &POA_CORBA_ValueDef::create_abstract_interface_skel}, - {"create_value_box", &POA_CORBA_ValueDef::create_value_box_skel}, - {"create_alias", &POA_CORBA_ValueDef::create_alias_skel}, - {"create_struct", &POA_CORBA_ValueDef::create_struct_skel}, - {"create_constant", &POA_CORBA_ValueDef::create_constant_skel}, + {"_get_is_abstract", &POA_CORBA_ValueDef::_get_is_abstract_skel}, + {"_set_is_abstract", &POA_CORBA_ValueDef::_set_is_abstract_skel}, + {"_get_initializers", &POA_CORBA_ValueDef::_get_initializers_skel}, + {"_set_initializers", &POA_CORBA_ValueDef::_set_initializers_skel}, + {"_get_containing_repository", &POA_CORBA_ValueDef::_get_containing_repository_skel}, + {"_get_id", &POA_CORBA_ValueDef::_get_id_skel}, + {"_set_id", &POA_CORBA_ValueDef::_set_id_skel}, + {"describe", &POA_CORBA_ValueDef::describe_skel}, + {"_get_supported_interfaces", &POA_CORBA_ValueDef::_get_supported_interfaces_skel}, + {"_set_abstract_base_values", &POA_CORBA_ValueDef::_set_abstract_base_values_skel}, + {"_get_abstract_base_values", &POA_CORBA_ValueDef::_get_abstract_base_values_skel}, + {"_set_supported_interfaces", &POA_CORBA_ValueDef::_set_supported_interfaces_skel}, + {"_get_def_kind", &POA_CORBA_ValueDef::_get_def_kind_skel}, + {"describe_value", &POA_CORBA_ValueDef::describe_value_skel}, + {"destroy", &POA_CORBA_ValueDef::destroy_skel}, + {"describe_contents", &POA_CORBA_ValueDef::describe_contents_skel}, + {"create_enum", &POA_CORBA_ValueDef::create_enum_skel}, + {"create_value", &POA_CORBA_ValueDef::create_value_skel}, + {"create_module", &POA_CORBA_ValueDef::create_module_skel}, + {"create_native", &POA_CORBA_ValueDef::create_native_skel}, + {"create_attribute", &POA_CORBA_ValueDef::create_attribute_skel}, + {"create_interface", &POA_CORBA_ValueDef::create_interface_skel}, + {"create_union", &POA_CORBA_ValueDef::create_union_skel}, + {"create_value_member", &POA_CORBA_ValueDef::create_value_member_skel}, + {"create_operation", &POA_CORBA_ValueDef::create_operation_skel}, + {"create_exception", &POA_CORBA_ValueDef::create_exception_skel}, + {"create_local_interface", &POA_CORBA_ValueDef::create_local_interface_skel}, + {"contents", &POA_CORBA_ValueDef::contents_skel}, + {"create_abstract_interface", &POA_CORBA_ValueDef::create_abstract_interface_skel}, + {"create_value_box", &POA_CORBA_ValueDef::create_value_box_skel}, + {"create_alias", &POA_CORBA_ValueDef::create_alias_skel}, + {"create_struct", &POA_CORBA_ValueDef::create_struct_skel}, + {"create_constant", &POA_CORBA_ValueDef::create_constant_skel}, }; static const signed char lookup[] = { - -12, -2, -14, -2, 4, 5, 6, -16, -2, 117, 10, 11, -19, -2, - -99, -98, -1, -95, 18, -92, 21, -1, -24, -2, 22, -1, -26, -2, - 23, -29, -2, -94, -91, -1, -32, -4, 28, -93, 31, -1, -91, -7, - -3, 36, 37, -1, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -42, -2, 39, -1, -44, -2, 40, 41, -93, -48, - -2, -92, 46, -1, 47, -1, -92, 50, 51, -1, 52, 53, 54, 55, - -1, 56, + -12, -2, -14, -2, 4, 5, 6, -16, -2, 117, 10, 11, -19, -2, + -99, -98, -1, -95, 18, -92, 21, -1, -24, -2, 22, -1, -26, -2, + 23, -29, -2, -94, -91, -1, -32, -4, 28, -93, 31, -1, -91, -7, + -3, 36, 37, -1, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -42, -2, 39, -1, -44, -2, 40, 41, -93, -48, + -2, -92, 46, -1, 47, -1, -92, 50, 51, -1, 52, 53, 54, 55, + -1, 56, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -3271,7 +3273,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3280,23 +3282,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -3307,7 +3309,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get &); - + private: POA_CORBA_ValueDef *_tao_impl; CORBA_InterfaceDefSeq * _result; @@ -3331,7 +3333,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -3343,11 +3345,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3356,11 +3358,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -3382,7 +3384,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA_InterfaceDefSeq * result) { // Update the result. @@ -3397,7 +3399,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA_InterfaceDefSeq & supported_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3406,37 +3408,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set (const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set &); - + private: POA_CORBA_ValueDef *_tao_impl; const CORBA_InterfaceDefSeq & supported_interfaces_; - + }; TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set ( @@ -3459,16 +3461,16 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->supported_interfaces_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -3480,11 +3482,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3493,7 +3495,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -3522,7 +3524,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3531,23 +3533,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -3558,7 +3560,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get &); - + private: POA_CORBA_ValueDef *_tao_impl; CORBA_InitializerSeq * _result; @@ -3582,7 +3584,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -3594,11 +3596,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3607,11 +3609,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -3633,7 +3635,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA_InitializerSeq * result) { // Update the result. @@ -3648,7 +3650,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA_InitializerSeq & initializers, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3657,37 +3659,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set (const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set &); - + private: POA_CORBA_ValueDef *_tao_impl; const CORBA_InitializerSeq & initializers_; - + }; TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set ( @@ -3710,16 +3712,16 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->initializers_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -3731,11 +3733,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3744,7 +3746,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -3773,7 +3775,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3782,23 +3784,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -3809,7 +3811,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get &); - + private: POA_CORBA_ValueDef *_tao_impl; CORBA_ValueDef_ptr _result; @@ -3833,7 +3835,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -3845,11 +3847,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3858,11 +3860,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -3884,7 +3886,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA_ValueDef_ptr result) { // Update the result. @@ -3899,7 +3901,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , CORBA_ValueDef_ptr base_value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3908,37 +3910,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set (const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set &); - + private: POA_CORBA_ValueDef *_tao_impl; CORBA_ValueDef_ptr base_value_; - + }; TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set ( @@ -3961,16 +3963,16 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->base_value_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -3982,11 +3984,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3995,7 +3997,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -4024,7 +4026,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4033,23 +4035,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4060,7 +4062,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get &); - + private: POA_CORBA_ValueDef *_tao_impl; CORBA_ValueDefSeq * _result; @@ -4084,7 +4086,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -4096,11 +4098,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4109,11 +4111,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -4135,7 +4137,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA_ValueDefSeq * result) { // Update the result. @@ -4150,7 +4152,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA_ValueDefSeq & abstract_base_values, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4159,37 +4161,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set (const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set &); - + private: POA_CORBA_ValueDef *_tao_impl; const CORBA_ValueDefSeq & abstract_base_values_; - + }; TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set ( @@ -4212,16 +4214,16 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->abstract_base_values_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -4233,11 +4235,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4246,7 +4248,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -4275,7 +4277,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4284,23 +4286,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4311,7 +4313,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (const TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get &); - + private: POA_CORBA_ValueDef *_tao_impl; CORBA::Boolean _result; @@ -4335,7 +4337,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (CORBA::Environm Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -4347,11 +4349,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (CORBA::Environ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4360,11 +4362,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); 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 (); } @@ -4386,7 +4388,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Boolean result) { // Update the result. @@ -4401,7 +4403,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA::Boolean & is_abstract, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4410,37 +4412,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set (const TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set &); - + private: POA_CORBA_ValueDef *_tao_impl; const CORBA::Boolean & is_abstract_; - + }; TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set ( @@ -4463,16 +4465,16 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (CORBA::Environm Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_); (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -4484,11 +4486,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (CORBA::Environ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4497,7 +4499,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -4526,7 +4528,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4535,23 +4537,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4562,7 +4564,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (const TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get &); - + private: POA_CORBA_ValueDef *_tao_impl; CORBA::Boolean _result; @@ -4586,7 +4588,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (CORBA::Environmen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -4598,11 +4600,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (CORBA::Environme Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4611,11 +4613,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Environment & CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); 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 (); } @@ -4637,7 +4639,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Boolean result) { // Update the result. @@ -4652,7 +4654,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA::Boolean & is_custom, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4661,37 +4663,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set (const TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set &); - + private: POA_CORBA_ValueDef *_tao_impl; const CORBA::Boolean & is_custom_; - + }; TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set ( @@ -4714,16 +4716,16 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (CORBA::Environmen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_); (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -4735,11 +4737,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (CORBA::Environme Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4748,7 +4750,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (CORBA::Environment & CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -4777,7 +4779,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4786,23 +4788,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -4813,7 +4815,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (const TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get &); - + private: POA_CORBA_ValueDef *_tao_impl; CORBA::Boolean _result; @@ -4837,7 +4839,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -4849,11 +4851,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4862,11 +4864,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); 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 (); } @@ -4888,7 +4890,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Boolean result) { // Update the result. @@ -4903,7 +4905,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA::Boolean & is_truncatable, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4912,37 +4914,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set (const TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set &); - + private: POA_CORBA_ValueDef *_tao_impl; const CORBA::Boolean & is_truncatable_; - + }; TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set ( @@ -4965,16 +4967,16 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (CORBA::Envir Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_); (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -4986,11 +4988,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (CORBA::Envi Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4999,7 +5001,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (CORBA::Environm CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -5029,7 +5031,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const char * id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5038,23 +5040,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5065,7 +5067,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_is_a (const TAO_ServerRequestInfo_CORBA_ValueDef_is_a &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_a &); - + private: POA_CORBA_ValueDef *_tao_impl; const char * id_; @@ -5092,16 +5094,16 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (CORBA::Environment &ACE_TR Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5113,11 +5115,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (CORBA::Environment &ACE_T Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5126,11 +5128,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); 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 (); } @@ -5152,7 +5154,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Boolean result) { // Update the result. @@ -5166,7 +5168,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5175,23 +5177,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5202,7 +5204,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (const TAO_ServerRequestInfo_CORBA_ValueDef_describe_value &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_describe_value &); - + private: POA_CORBA_ValueDef *_tao_impl; CORBA_ValueDef::FullValueDescription * _result; @@ -5226,7 +5228,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (CORBA::Environme Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -5238,11 +5240,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (CORBA::Environm Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5251,11 +5253,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5277,7 +5279,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (CORBA_ValueDef::FullValueDescription * result) { // Update the result. @@ -5296,7 +5298,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Visibility & access, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5305,23 +5307,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5332,7 +5334,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member (const TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member &); - + private: POA_CORBA_ValueDef *_tao_impl; const char * id_; @@ -5371,12 +5373,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Envi Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (5); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -5392,7 +5394,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Envi (*parameter_list)[len].argument <<= access_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5404,11 +5406,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (CORBA::Env Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5417,11 +5419,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5443,7 +5445,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA_ValueMemberDef_ptr result) { // Update the result. @@ -5462,7 +5464,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5471,23 +5473,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5498,7 +5500,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute (const TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute &); - + private: POA_CORBA_ValueDef *_tao_impl; const char * id_; @@ -5537,12 +5539,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (5); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -5558,7 +5560,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environ (*parameter_list)[len].argument <<= this->mode_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5570,11 +5572,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5583,11 +5585,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5609,7 +5611,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA_AttributeDef_ptr result) { // Update the result. @@ -5631,7 +5633,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5640,23 +5642,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -5667,7 +5669,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueDef_create_operation (const TAO_ServerRequestInfo_CORBA_ValueDef_create_operation &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_create_operation &); - + private: POA_CORBA_ValueDef *_tao_impl; const char * id_; @@ -5715,12 +5717,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (8); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= id_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; @@ -5745,7 +5747,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environ (*parameter_list)[len].argument <<= this->contexts_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -5757,11 +5759,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (CORBA::Enviro Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5770,11 +5772,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environmen CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5796,7 +5798,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (CORBA_OperationDef_ptr result) { // Update the result. @@ -5820,14 +5822,14 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::_TAO_CORBA_ValueDef_Strategized_Pr { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_ValueDef_Proxy_Impl& @@ -5837,26 +5839,27 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -5869,7 +5872,7 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -5879,9 +5882,9 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -5901,13 +5904,13 @@ _TAO_CORBA_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_ValueDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_ValueDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_ValueDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_ValueDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ValueDef_Proxy_Broker_Factory_Initializer)); @@ -6587,37 +6590,37 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( { POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA_InterfaceDefSeq_var _tao_retval; #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_CORBA_ValueDef_supported_interfaces_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->supported_interfaces ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -6634,11 +6637,11 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -6646,11 +6649,11 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( 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 ()) )) @@ -6658,7 +6661,7 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -6673,7 +6676,7 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_InterfaceDefSeq supported_interfaces; if (!( @@ -6685,12 +6688,12 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel ( #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_CORBA_ValueDef_supported_interfaces_set ri ( _tao_server_request, _tao_upcall, @@ -6698,20 +6701,20 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel ( supported_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->supported_interfaces ( supported_interfaces, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -6725,11 +6728,11 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -6737,12 +6740,12 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -6756,37 +6759,37 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( { POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA_InitializerSeq_var _tao_retval; #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_CORBA_ValueDef_initializers_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->initializers ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_InitializerSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -6803,11 +6806,11 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -6815,11 +6818,11 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( 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 ()) )) @@ -6827,7 +6830,7 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -6842,7 +6845,7 @@ void POA_CORBA_ValueDef::_set_initializers_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_InitializerSeq initializers; if (!( @@ -6854,12 +6857,12 @@ void POA_CORBA_ValueDef::_set_initializers_skel ( #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_CORBA_ValueDef_initializers_set ri ( _tao_server_request, _tao_upcall, @@ -6867,20 +6870,20 @@ void POA_CORBA_ValueDef::_set_initializers_skel ( initializers, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->initializers ( initializers, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -6894,11 +6897,11 @@ void POA_CORBA_ValueDef::_set_initializers_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -6906,12 +6909,12 @@ void POA_CORBA_ValueDef::_set_initializers_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -6925,37 +6928,37 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( { POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA_ValueDef_var _tao_retval; #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_CORBA_ValueDef_base_value_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->base_value ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ValueDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -6972,11 +6975,11 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -6984,11 +6987,11 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( 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 ()) )) @@ -6996,7 +6999,7 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7011,7 +7014,7 @@ void POA_CORBA_ValueDef::_set_base_value_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_ValueDef_var base_value; if (!( @@ -7023,12 +7026,12 @@ void POA_CORBA_ValueDef::_set_base_value_skel ( #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_CORBA_ValueDef_base_value_set ri ( _tao_server_request, _tao_upcall, @@ -7036,20 +7039,20 @@ void POA_CORBA_ValueDef::_set_base_value_skel ( base_value.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->base_value ( base_value.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -7063,11 +7066,11 @@ void POA_CORBA_ValueDef::_set_base_value_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7075,12 +7078,12 @@ void POA_CORBA_ValueDef::_set_base_value_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7094,37 +7097,37 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( { POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA_ValueDefSeq_var _tao_retval; #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_CORBA_ValueDef_abstract_base_values_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->abstract_base_values ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ValueDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -7141,11 +7144,11 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7153,11 +7156,11 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( 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 ()) )) @@ -7165,7 +7168,7 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7180,7 +7183,7 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_ValueDefSeq abstract_base_values; if (!( @@ -7192,12 +7195,12 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel ( #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_CORBA_ValueDef_abstract_base_values_set ri ( _tao_server_request, _tao_upcall, @@ -7205,20 +7208,20 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel ( abstract_base_values, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->abstract_base_values ( abstract_base_values, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -7232,11 +7235,11 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7244,12 +7247,12 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7263,37 +7266,37 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( { POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA::Boolean _tao_retval = 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_CORBA_ValueDef_is_abstract_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_abstract ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -7309,11 +7312,11 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7321,11 +7324,11 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( 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)) )) @@ -7333,7 +7336,7 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7348,7 +7351,7 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::Boolean is_abstract; if (!( @@ -7360,12 +7363,12 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel ( #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_CORBA_ValueDef_is_abstract_set ri ( _tao_server_request, _tao_upcall, @@ -7373,20 +7376,20 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel ( is_abstract, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->is_abstract ( is_abstract, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -7400,11 +7403,11 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7412,12 +7415,12 @@ void POA_CORBA_ValueDef::_set_is_abstract_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7431,37 +7434,37 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( { POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA::Boolean _tao_retval = 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_CORBA_ValueDef_is_custom_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_custom ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -7477,11 +7480,11 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7489,11 +7492,11 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( 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)) )) @@ -7501,7 +7504,7 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7516,7 +7519,7 @@ void POA_CORBA_ValueDef::_set_is_custom_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::Boolean is_custom; if (!( @@ -7528,12 +7531,12 @@ void POA_CORBA_ValueDef::_set_is_custom_skel ( #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_CORBA_ValueDef_is_custom_set ri ( _tao_server_request, _tao_upcall, @@ -7541,20 +7544,20 @@ void POA_CORBA_ValueDef::_set_is_custom_skel ( is_custom, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->is_custom ( is_custom, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -7568,11 +7571,11 @@ void POA_CORBA_ValueDef::_set_is_custom_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7580,12 +7583,12 @@ void POA_CORBA_ValueDef::_set_is_custom_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7599,37 +7602,37 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( { POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA::Boolean _tao_retval = 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_CORBA_ValueDef_is_truncatable_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_truncatable ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -7645,11 +7648,11 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7657,11 +7660,11 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( 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)) )) @@ -7669,7 +7672,7 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7684,7 +7687,7 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA::Boolean is_truncatable; if (!( @@ -7696,12 +7699,12 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel ( #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_CORBA_ValueDef_is_truncatable_set ri ( _tao_server_request, _tao_upcall, @@ -7709,20 +7712,20 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel ( is_truncatable, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->is_truncatable ( is_truncatable, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -7736,11 +7739,11 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7748,12 +7751,12 @@ void POA_CORBA_ValueDef::_set_is_truncatable_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7768,7 +7771,7 @@ void POA_CORBA_ValueDef::is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA::Boolean _tao_retval = 0; CORBA::String_var id; if (!( @@ -7780,12 +7783,12 @@ void POA_CORBA_ValueDef::is_a_skel ( #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_CORBA_ValueDef_is_a ri ( _tao_server_request, _tao_upcall, @@ -7793,20 +7796,20 @@ void POA_CORBA_ValueDef::is_a_skel ( id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_a ( id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -7822,11 +7825,11 @@ void POA_CORBA_ValueDef::is_a_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7834,11 +7837,11 @@ void POA_CORBA_ValueDef::is_a_skel ( 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)) )) @@ -7846,7 +7849,7 @@ void POA_CORBA_ValueDef::is_a_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7860,37 +7863,37 @@ void POA_CORBA_ValueDef::describe_value_skel ( { POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA_ValueDef::FullValueDescription_var _tao_retval; #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_CORBA_ValueDef_describe_value ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->describe_value ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ValueDef::FullValueDescription * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -7907,11 +7910,11 @@ void POA_CORBA_ValueDef::describe_value_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -7919,11 +7922,11 @@ void POA_CORBA_ValueDef::describe_value_skel ( 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 ()) )) @@ -7931,7 +7934,7 @@ void POA_CORBA_ValueDef::describe_value_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -7946,7 +7949,7 @@ void POA_CORBA_ValueDef::create_value_member_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA_ValueMemberDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -7966,12 +7969,12 @@ void POA_CORBA_ValueDef::create_value_member_skel ( #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_CORBA_ValueDef_create_value_member ri ( _tao_server_request, _tao_upcall, @@ -7983,14 +7986,14 @@ void POA_CORBA_ValueDef::create_value_member_skel ( access, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_value_member ( id.in (), name.in (), @@ -8000,7 +8003,7 @@ void POA_CORBA_ValueDef::create_value_member_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8017,11 +8020,11 @@ void POA_CORBA_ValueDef::create_value_member_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8029,11 +8032,11 @@ void POA_CORBA_ValueDef::create_value_member_skel ( 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 ()) )) @@ -8041,7 +8044,7 @@ void POA_CORBA_ValueDef::create_value_member_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8056,7 +8059,7 @@ void POA_CORBA_ValueDef::create_attribute_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA_AttributeDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8076,12 +8079,12 @@ void POA_CORBA_ValueDef::create_attribute_skel ( #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_CORBA_ValueDef_create_attribute ri ( _tao_server_request, _tao_upcall, @@ -8093,14 +8096,14 @@ void POA_CORBA_ValueDef::create_attribute_skel ( mode, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_attribute ( id.in (), name.in (), @@ -8110,7 +8113,7 @@ void POA_CORBA_ValueDef::create_attribute_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_AttributeDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8127,11 +8130,11 @@ void POA_CORBA_ValueDef::create_attribute_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8139,11 +8142,11 @@ void POA_CORBA_ValueDef::create_attribute_skel ( 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 ()) )) @@ -8151,7 +8154,7 @@ void POA_CORBA_ValueDef::create_attribute_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -8166,7 +8169,7 @@ void POA_CORBA_ValueDef::create_operation_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference); - + CORBA_OperationDef_var _tao_retval; CORBA::String_var id; CORBA::String_var name; @@ -8192,12 +8195,12 @@ void POA_CORBA_ValueDef::create_operation_skel ( #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_CORBA_ValueDef_create_operation ri ( _tao_server_request, _tao_upcall, @@ -8212,14 +8215,14 @@ void POA_CORBA_ValueDef::create_operation_skel ( contexts, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_operation ( id.in (), name.in (), @@ -8232,7 +8235,7 @@ void POA_CORBA_ValueDef::create_operation_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_OperationDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8249,11 +8252,11 @@ void POA_CORBA_ValueDef::create_operation_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -8261,11 +8264,11 @@ void POA_CORBA_ValueDef::create_operation_skel ( 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 ()) )) @@ -8273,13 +8276,13 @@ void POA_CORBA_ValueDef::create_operation_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_ValueDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -8291,10 +8294,10 @@ void POA_CORBA_ValueDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -8302,7 +8305,7 @@ void POA_CORBA_ValueDef::_is_a_skel ( } void POA_CORBA_ValueDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -8311,7 +8314,7 @@ void POA_CORBA_ValueDef::_non_existent_skel ( POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -8319,7 +8322,7 @@ void POA_CORBA_ValueDef::_non_existent_skel ( } void POA_CORBA_ValueDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -8328,26 +8331,26 @@ void POA_CORBA_ValueDef::_interface_skel ( POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -8359,7 +8362,7 @@ void POA_CORBA_ValueDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -8373,7 +8376,7 @@ CORBA::Boolean POA_CORBA_ValueDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || @@ -8424,20 +8427,20 @@ POA_CORBA_ValueDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_ValueDef::_unchecked_narrow (obj.in ()); } @@ -8520,32 +8523,32 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"move", &POA_CORBA_ValueBoxDef::move_skel}, + {"move", &POA_CORBA_ValueBoxDef::move_skel}, {"_is_a", &POA_CORBA_ValueBoxDef::_is_a_skel}, - {"_get_id", &POA_CORBA_ValueBoxDef::_get_id_skel}, - {"_set_id", &POA_CORBA_ValueBoxDef::_set_id_skel}, - {"describe", &POA_CORBA_ValueBoxDef::describe_skel}, - {"_get_name", &POA_CORBA_ValueBoxDef::_get_name_skel}, - {"_get_type", &POA_CORBA_ValueBoxDef::_get_type_skel}, - {"_set_name", &POA_CORBA_ValueBoxDef::_set_name_skel}, + {"_get_id", &POA_CORBA_ValueBoxDef::_get_id_skel}, + {"_set_id", &POA_CORBA_ValueBoxDef::_set_id_skel}, + {"describe", &POA_CORBA_ValueBoxDef::describe_skel}, + {"_get_name", &POA_CORBA_ValueBoxDef::_get_name_skel}, + {"_get_type", &POA_CORBA_ValueBoxDef::_get_type_skel}, + {"_set_name", &POA_CORBA_ValueBoxDef::_set_name_skel}, {"_interface", &POA_CORBA_ValueBoxDef::_interface_skel}, - {"_get_version", &POA_CORBA_ValueBoxDef::_get_version_skel}, - {"_set_version", &POA_CORBA_ValueBoxDef::_set_version_skel}, - {"_get_def_kind", &POA_CORBA_ValueBoxDef::_get_def_kind_skel}, - {"_get_defined_in", &POA_CORBA_ValueBoxDef::_get_defined_in_skel}, - {"destroy", &POA_CORBA_ValueBoxDef::destroy_skel}, - {"_get_absolute_name", &POA_CORBA_ValueBoxDef::_get_absolute_name_skel}, - {"_get_original_type_def", &POA_CORBA_ValueBoxDef::_get_original_type_def_skel}, - {"_set_original_type_def", &POA_CORBA_ValueBoxDef::_set_original_type_def_skel}, + {"_get_version", &POA_CORBA_ValueBoxDef::_get_version_skel}, + {"_set_version", &POA_CORBA_ValueBoxDef::_set_version_skel}, + {"_get_def_kind", &POA_CORBA_ValueBoxDef::_get_def_kind_skel}, + {"_get_defined_in", &POA_CORBA_ValueBoxDef::_get_defined_in_skel}, + {"destroy", &POA_CORBA_ValueBoxDef::destroy_skel}, + {"_get_absolute_name", &POA_CORBA_ValueBoxDef::_get_absolute_name_skel}, + {"_get_original_type_def", &POA_CORBA_ValueBoxDef::_get_original_type_def_skel}, + {"_set_original_type_def", &POA_CORBA_ValueBoxDef::_set_original_type_def_skel}, {"_non_existent", &POA_CORBA_ValueBoxDef::_non_existent_skel}, - {"_get_containing_repository", &POA_CORBA_ValueBoxDef::_get_containing_repository_skel}, + {"_get_containing_repository", &POA_CORBA_ValueBoxDef::_get_containing_repository_skel}, }; static const signed char lookup[] = { - -9, -3, -13, -2, 4, 5, -1, 53, 8, -45, 12, -1, -46, 15, - -1, 16, -1, 17, 18, -1, -19, -2, -38, 21, -6, -2, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 22, + -9, -3, -13, -2, 4, 5, -1, 53, 8, -45, 12, -1, -46, 15, + -1, 16, -1, 17, 18, -1, -19, -2, -38, 21, -6, -2, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 22, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -8590,7 +8593,7 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -8599,23 +8602,23 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -8626,7 +8629,7 @@ public: private: TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get &); - + private: POA_CORBA_ValueBoxDef *_tao_impl; CORBA_IDLType_ptr _result; @@ -8650,7 +8653,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -8662,11 +8665,11 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -8675,11 +8678,11 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -8701,7 +8704,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA_IDLType_ptr result) { // Update the result. @@ -8716,7 +8719,7 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl , CORBA_IDLType_ptr original_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -8725,37 +8728,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set (const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set &); void operator= (const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set &); - + private: POA_CORBA_ValueBoxDef *_tao_impl; CORBA_IDLType_ptr original_type_def_; - + }; TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set ( @@ -8778,16 +8781,16 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + parameter_list->length (1); CORBA::ULong len = 0; - + (*parameter_list)[len].argument <<= this->original_type_def_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -8799,11 +8802,11 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -8812,7 +8815,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -8851,14 +8854,14 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::_TAO_CORBA_ValueBoxDef_Strategi { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_CORBA_ValueBoxDef_Proxy_Impl& @@ -8868,26 +8871,27 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); - + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -8900,7 +8904,7 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( @@ -8910,9 +8914,9 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -8932,13 +8936,13 @@ _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) int _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_Initializer (long) { - _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function_pointer = + _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function_pointer = _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_CORBA_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_CORBA_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_Initializer)); @@ -9047,37 +9051,37 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( { POA_CORBA_ValueBoxDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueBoxDef *, _tao_object_reference); - + CORBA_IDLType_var _tao_retval; #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_CORBA_ValueBoxDef_original_type_def_get ri ( _tao_server_request, _tao_upcall, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->original_type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -9094,11 +9098,11 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9106,11 +9110,11 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( 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 ()) )) @@ -9118,7 +9122,7 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( // In case _tao_servant_upcall is not used in this function ACE_UNUSED_ARG (_tao_servant_upcall); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -9133,7 +9137,7 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA_ValueBoxDef *_tao_impl = ACE_static_cast (POA_CORBA_ValueBoxDef *, _tao_object_reference); - + _tao_server_request.argument_flag (0); CORBA_IDLType_var original_type_def; if (!( @@ -9145,12 +9149,12 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel ( #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_CORBA_ValueBoxDef_original_type_def_set ri ( _tao_server_request, _tao_upcall, @@ -9158,20 +9162,20 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel ( original_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->original_type_def ( original_type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -9185,11 +9189,11 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + PortableInterceptor::ReplyStatus _tao_status = ri.reply_status (ACE_TRY_ENV); ACE_TRY_CHECK; - + if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION || _tao_status == PortableInterceptor::USER_EXCEPTION) ACE_RE_THROW; @@ -9197,18 +9201,18 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_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); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_ValueBoxDef::_is_a_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9220,10 +9224,10 @@ void POA_CORBA_ValueBoxDef::_is_a_skel ( CORBA::String_var value; if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -9231,7 +9235,7 @@ void POA_CORBA_ValueBoxDef::_is_a_skel ( } void POA_CORBA_ValueBoxDef::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9240,7 +9244,7 @@ void POA_CORBA_ValueBoxDef::_non_existent_skel ( POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) @@ -9248,7 +9252,7 @@ void POA_CORBA_ValueBoxDef::_non_existent_skel ( } void POA_CORBA_ValueBoxDef::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -9257,26 +9261,26 @@ void POA_CORBA_ValueBoxDef::_interface_skel ( POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference; CORBA_InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; - + TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name () ); - + if (_tao_adapter == 0) { ACE_THROW (CORBA::INTF_REPOS ()); } - + ACE_TRY { _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); ACE_TRY_CHECK; - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + _tao_result = _tao_adapter->interfacedef_cdr_insert ( _tao_out, @@ -9288,7 +9292,7 @@ void POA_CORBA_ValueBoxDef::_interface_skel ( _tao_adapter->dispose (_tao_retval); } ACE_ENDTRY; - + if (_tao_result == 0) { ACE_THROW (CORBA::MARSHAL ()); @@ -9302,7 +9306,7 @@ CORBA::Boolean POA_CORBA_ValueBoxDef::_is_a ( { const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || @@ -9353,20 +9357,20 @@ POA_CORBA_ValueBoxDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); 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 (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; - + (void) safe_stub.release (); - + return ::CORBA_ValueBoxDef::_unchecked_narrow (obj.in ()); } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp index d84e55f4d7f..953eaef95ee 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp @@ -9,6 +9,7 @@ #include "tao/PortableServer/Default_Acceptor_Filter.h" #include "tao/Acceptor_Registry.h" +#include "tao/Thread_Lane_Resources.h" #include "tao/ORB_Core.h" #include "tao/MProfile.h" @@ -292,7 +293,7 @@ ImplRepo_i::start_server_i (const char *server, // Win32 does not support the CLOSE_ON_EXEC semantics for sockets // the way unix does, so in order to avoid having the child process // hold the listen socket open, we force the child to inherit no - // handles. This includes stdin, stdout, logs, etc. + // handles. This includes stdin, stdout, logs, etc. for (size_t i = 0; i < environment.length(); ++i) proc_opts.setenv (environment[i].name.in (), environment[i].value.in ()); @@ -690,7 +691,8 @@ ImplRepo_i::server_is_running (const char *server, ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), new_location); } - TAO_Acceptor_Registry *registry = orb->orb_core ()->acceptor_registry (); + TAO_Acceptor_Registry ®istry = + orb->orb_core ()->lane_resources ().acceptor_registry (); TAO_MProfile mp; TAO_ObjectKey objkey; @@ -699,7 +701,19 @@ ImplRepo_i::server_is_running (const char *server, // matter what the server has. TAO_Default_Acceptor_Filter filter; - registry->make_mprofile (objkey, mp, &filter); + // Allocate space for storing the profiles. There can never be more + // profiles than there are endpoints. In some cases, there can be + // fewer profiles than endpoints. + size_t pfile_count = + registry.endpoint_count (); + mp.set (pfile_count); + + // Leave it to the filter to decide which acceptors/in which order + // go into the mprofile. + filter.fill_profile (objkey, + mp, + registry.begin (), + registry.end ()); // @@ (brunsch) Only look at current profile for now. TAO_Profile *profile = mp.get_current_profile (); @@ -1126,7 +1140,7 @@ ImplRepo_i::~ImplRepo_i (void) ACE_Reactor *reactor = orb->orb_core ()->reactor (); // Register event handler for the ior multicast. - if (this->ior_multicast_ + if (this->ior_multicast_ && reactor->remove_handler (this->ior_multicast_, ACE_Event_Handler::READ_MASK) == -1) if (OPTIONS::instance ()->debug () > 0) diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index 6e8d3a5d5e4..35d8ddc685f 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -133,7 +133,7 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned {"",0},{"",0}, {"_non_existent", &POA_CORBA_DomainManager::_non_existent_skel}, {"",0},{"",0},{"",0}, - {"get_domain_policy", &POA_CORBA_DomainManager::get_domain_policy_skel}, + {"get_domain_policy", &POA_CORBA_DomainManager::get_domain_policy_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -326,7 +326,8 @@ _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; @@ -785,18 +786,18 @@ TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsi static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"copy", &POA_CORBA_ConstructionPolicy::copy_skel}, + {"copy", &POA_CORBA_ConstructionPolicy::copy_skel}, {"_is_a", &POA_CORBA_ConstructionPolicy::_is_a_skel}, {"",0}, - {"destroy", &POA_CORBA_ConstructionPolicy::destroy_skel}, + {"destroy", &POA_CORBA_ConstructionPolicy::destroy_skel}, {"",0},{"",0}, {"_interface", &POA_CORBA_ConstructionPolicy::_interface_skel}, {"",0},{"",0}, {"_non_existent", &POA_CORBA_ConstructionPolicy::_non_existent_skel}, {"",0},{"",0}, - {"_get_policy_type", &POA_CORBA_ConstructionPolicy::_get_policy_type_skel}, + {"_get_policy_type", &POA_CORBA_ConstructionPolicy::_get_policy_type_skel}, {"",0},{"",0}, - {"make_domain_manager", &POA_CORBA_ConstructionPolicy::make_domain_manager_skel}, + {"make_domain_manager", &POA_CORBA_ConstructionPolicy::make_domain_manager_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -984,7 +985,8 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy ( ) { int strategy = - TAO_ORB_Core::collocation_strategy (object); + TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 52e649885bb..ef812ce8907 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -121,7 +121,6 @@ TAO_IOR_Manipulation_impl::merge_iors ( TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string Merged_Profiles, - orb_core, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -226,7 +225,6 @@ TAO_IOR_Manipulation_impl::remove_profiles ( TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string Diff_Profiles, - orb_core, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 2ff165ca020..415538258c0 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -15,6 +15,7 @@ #include "tao/LF_Follower.h" #include "tao/ORB_Core.h" +#include "tao/New_Leader_Generator.h" #include "ace/Intrusive_List.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -22,12 +23,14 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ class TAO_LF_Event; +class TAO_New_Leader_Generator; class TAO_Export TAO_Leader_Follower { public: /// Constructor - TAO_Leader_Follower (TAO_ORB_Core *orb_core); + TAO_Leader_Follower (TAO_ORB_Core *orb_core, + TAO_New_Leader_Generator *new_leader_generator = 0); /// Destructor ~TAO_Leader_Follower (void); @@ -155,6 +158,9 @@ public: /// Accesor to the reactor ACE_Reactor *reactor (void); + /// Called when we are out of leaders. + virtual void no_leaders_available (void); + private: /// Shortcut to obtain the TSS resources of the orb core. TAO_ORB_Core_TSS_Resources *get_tss_resources (void) const; @@ -225,6 +231,10 @@ private: /// Condition variable for server threads waiting for the client /// leader to complete. TAO_SYNCH_CONDITION event_loop_threads_condition_; + + /// Leader/Follower class uses this method to notify the system that + /// we are out of leaders. + TAO_New_Leader_Generator *new_leader_generator_; }; class TAO_Export TAO_LF_Client_Thread_Helper diff --git a/TAO/tao/Leader_Follower.i b/TAO/tao/Leader_Follower.i index 6bddae3f4be..95cf6a6bb95 100644 --- a/TAO/tao/Leader_Follower.i +++ b/TAO/tao/Leader_Follower.i @@ -4,7 +4,8 @@ // **************************************************************** ACE_INLINE -TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core) +TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core, + TAO_New_Leader_Generator *new_leader_generator) : orb_core_ (orb_core), reverse_lock_ (lock_), leaders_ (0), @@ -12,7 +13,8 @@ TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core) reactor_ (0), client_thread_is_leader_ (0), event_loop_threads_waiting_ (0), - event_loop_threads_condition_ (lock_) + event_loop_threads_condition_ (lock_), + new_leader_generator_ (new_leader_generator) { } @@ -41,6 +43,10 @@ TAO_Leader_Follower::elect_new_leader (void) { return this->elect_new_leader_i (); } + else + { + this->no_leaders_available (); + } } return 0; } @@ -177,6 +183,13 @@ TAO_Leader_Follower::has_clients (void) const return this->clients_; } +ACE_INLINE void +TAO_Leader_Follower::no_leaders_available (void) +{ + if (this->new_leader_generator_) + this->new_leader_generator_->no_leaders_available (); +} + // **************************************************************** ACE_INLINE diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h new file mode 100644 index 00000000000..f168abb1e14 --- /dev/null +++ b/TAO/tao/New_Leader_Generator.h @@ -0,0 +1,40 @@ +//============================================================================= +/** + * @file New_Leader_Generator.h + * + * $Id$ + * + * @author Irfan Pyarali + */ +// =================================================================== + +#ifndef TAO_NEW_LEADER_GENERATOR_H +#define TAO_NEW_LEADER_GENERATOR_H + +#include "ace/pre.h" +#include "tao/orbconf.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +/** + * @class TAO_RT_New_Leader_Generator + * + * @brief Class for creating dynamic threads. + * + * \nosubgrouping + * + **/ +class TAO_Export TAO_New_Leader_Generator +{ +public: + + /// Leader/Follower class uses this method to notify the system that + /// we are out of leaders. + virtual void no_leaders_available (void) = 0; +}; + +#include "ace/post.h" + +#endif /* TAO_NEW_LEADER_GENERATOR_H */ diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h index be6f0e000e3..61b16aa9077 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h @@ -57,7 +57,7 @@ public: TAO_MProfile &mprofile, TAO_Acceptor **acceptors_begin, TAO_Acceptor **acceptors_end, - CORBA::Short priority); + CORBA::Short priority = TAO_INVALID_PRIORITY); /// Encodes the endpoints in the profiles into the TAO_TAG_ENDPOINTS /// tag component of profiles. diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index e2190bf2ce6..35978b2883d 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -17,6 +17,51 @@ ACE_RCSID(tao, Thread_Pool, "$Id$") # include "Thread_Pool.i" #endif /* ! __ACE_INLINE__ */ +TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator (TAO_Thread_Lane &lane) + : lane_ (lane) +{ +} + +void +TAO_RT_New_Leader_Generator::no_leaders_available (void) +{ + if (this->lane_.dynamic_threads () == 0) + return; + + TAO_Thread_Pool_Manager &manager = + this->lane_.pool ().manager (); + + ACE_GUARD (ACE_SYNCH_MUTEX, + mon, + manager.lock ()); + + if (this->lane_.current_threads () < + (this->lane_.static_threads () + + this->lane_.dynamic_threads ()) && + !manager.orb_core ().has_shutdown ()) + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO Process %P Pool %d Lane %d Thread %t\n") + ACE_TEXT ("Current number of threads = %d; static threads = %d; dynamic threads = %d\n") + ACE_TEXT ("No leaders available; creating new leader!\n"), + this->lane_.pool ().id (), + this->lane_.id (), + this->lane_.current_threads (), + this->lane_.static_threads (), + this->lane_.dynamic_threads ())); + + int result = + this->lane_.create_dynamic_threads (1); + + if (result != 0) + ACE_ERROR ((LM_ERROR, + "Pool %d Lane %d Thread %t: cannot create dynamic thread\n", + this->lane_.pool ().id (), + this->lane_.id ())); + } +} + TAO_Thread_Pool_Threads::TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane) : ACE_Task_Base (lane.pool ().manager ().orb_core ().thr_mgr ()), lane_ (lane) @@ -35,6 +80,9 @@ TAO_Thread_Pool_Threads::svc (void) TAO_ORB_Core &orb_core = this->lane ().pool ().manager ().orb_core (); + if (orb_core.has_shutdown ()) + return 0; + // Set TSS resources for this thread. TAO_Thread_Pool_Threads::set_tss_resources (orb_core, this->lane_); @@ -85,8 +133,11 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool, lane_priority_ (lane_priority), static_threads_ (static_threads), dynamic_threads_ (dynamic_threads), + current_threads_ (0), + new_thread_generator_ (*this), threads_ (*this), - resources_ (pool.manager ().orb_core ()), + resources_ (pool.manager ().orb_core (), + &new_thread_generator_), native_priority_ (TAO_INVALID_PRIORITY) { } @@ -229,15 +280,24 @@ TAO_Thread_Lane::create_dynamic_threads (CORBA::ULong number_of_threads) orb_core.orb_params ()->sched_policy (); // Activate the threads. - return this->threads_.activate (flags, - number_of_threads, - force_active, - this->native_priority_, - default_grp_id, - default_task, - default_thread_handles, - default_stack, - stack_size_array); + int result = + this->threads_.activate (flags, + number_of_threads, + force_active, + this->native_priority_, + default_grp_id, + default_task, + default_thread_handles, + default_stack, + stack_size_array); + + if (result != 0) + return result; + + this->current_threads_ += + number_of_threads; + + return result; } CORBA::ULong @@ -276,6 +336,18 @@ TAO_Thread_Lane::dynamic_threads (void) const return this->dynamic_threads_; } +CORBA::ULong +TAO_Thread_Lane::current_threads (void) const +{ + return this->current_threads_; +} + +void +TAO_Thread_Lane::current_threads (CORBA::ULong current_threads) +{ + this->current_threads_ = current_threads; +} + TAO_Thread_Pool_Threads & TAO_Thread_Lane::threads (void) { @@ -789,6 +861,12 @@ TAO_Thread_Pool_Manager::orb_core (void) const return this->orb_core_; } +ACE_SYNCH_MUTEX & +TAO_Thread_Pool_Manager::lock (void) +{ + return this->lock_; +} + TAO_Thread_Pool_Manager::THREAD_POOLS & TAO_Thread_Pool_Manager::thread_pools (void) { diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index 01903b7d761..3f8bdeb4f80 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -24,11 +24,38 @@ #include "ace/Hash_Map_Manager.h" #include "tao/Thread_Lane_Resources.h" +#include "tao/New_Leader_Generator.h" #include "ace/Task.h" class TAO_Thread_Lane; /** + * @class TAO_RT_New_Leader_Generator + * + * @brief Class for creating dynamic threads. + * + * \nosubgrouping + * + **/ +class TAO_RTCORBA_Export TAO_RT_New_Leader_Generator + : public TAO_New_Leader_Generator +{ +public: + + /// Constructor. + TAO_RT_New_Leader_Generator (TAO_Thread_Lane &lane); + + /// Leader/Follower class uses this method to notify the system that + /// we are out of leaders. + void no_leaders_available (void); + +private: + + /// Lane associated with this leader generator. + TAO_Thread_Lane &lane_; +}; + +/** * @class TAO_Thread_Pool_Threads * * @brief Class representing a thread running in a thread lane. @@ -116,6 +143,9 @@ public: CORBA::ULong static_threads (void) const; CORBA::ULong dynamic_threads (void) const; + CORBA::ULong current_threads (void) const; + void current_threads (CORBA::ULong); + CORBA::Short native_priority (void) const; TAO_Thread_Pool_Threads &threads (void); @@ -136,8 +166,12 @@ private: CORBA::ULong static_threads_; CORBA::ULong dynamic_threads_; + CORBA::ULong current_threads_; + TAO_Thread_Pool_Threads threads_; + TAO_RT_New_Leader_Generator new_thread_generator_; + TAO_Thread_Lane_Resources resources_; CORBA::Short native_priority_; @@ -301,15 +335,20 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)); - /// ORB_Core accessor. - TAO_ORB_Core &orb_core (void) const; - /// Collection of thread pools. typedef ACE_Hash_Map_Manager<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Null_Mutex> THREAD_POOLS; - /// Access the thread pools managed by this class. + /// @name Accessors + // @{ + + ACE_SYNCH_MUTEX &lock (void); + + TAO_ORB_Core &orb_core (void) const; + THREAD_POOLS &thread_pools (void); + // @} + private: /// @name Helpers diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp index a305598c07d..eaf5a081533 100644 --- a/TAO/tao/Thread_Lane_Resources.cpp +++ b/TAO/tao/Thread_Lane_Resources.cpp @@ -14,11 +14,13 @@ ACE_RCSID(tao, Thread_Lane_Resources, "$Id$") # include "tao/Thread_Lane_Resources.i" #endif /* ! __ACE_INLINE__ */ -TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources (TAO_ORB_Core &orb_core) +TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources (TAO_ORB_Core &orb_core, + TAO_New_Leader_Generator *new_leader_generator) : orb_core_ (orb_core), acceptor_registry_ (0), transport_cache_ (0), - leader_follower_ (0) + leader_follower_ (0), + new_leader_generator_ (new_leader_generator) { // Create the transport cache. ACE_NEW (this->transport_cache_, @@ -84,7 +86,8 @@ TAO_Thread_Lane_Resources::leader_follower (void) { // Create a new Leader Follower object. ACE_NEW_RETURN (this->leader_follower_, - TAO_Leader_Follower (&this->orb_core_), + TAO_Leader_Follower (&this->orb_core_, + this->new_leader_generator_), *this->leader_follower_); } } diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index 1b2ca3451fa..9635b8d0293 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -25,6 +25,7 @@ class TAO_Acceptor_Registry; class TAO_Transport_Cache_Manager; class TAO_Leader_Follower; class TAO_MProfile; +class TAO_New_Leader_Generator; /** * @class TAO_Thread_Lane_Resources @@ -38,7 +39,8 @@ class TAO_Export TAO_Thread_Lane_Resources { public: /// Constructor. - TAO_Thread_Lane_Resources (TAO_ORB_Core &orb_core); + TAO_Thread_Lane_Resources (TAO_ORB_Core &orb_core, + TAO_New_Leader_Generator *new_leader_generator = 0); /// Destructor. ~TAO_Thread_Lane_Resources (void); @@ -87,6 +89,9 @@ private: /// Synchronization. TAO_SYNCH_MUTEX lock_; + + /// Generator of new leader threads. + TAO_New_Leader_Generator *new_leader_generator_; }; #if defined (__ACE_INLINE__) diff --git a/TAO/threadpool-changes b/TAO/threadpool-changes index 3abe54d9e85..79dff263f58 100644 --- a/TAO/threadpool-changes +++ b/TAO/threadpool-changes @@ -241,7 +241,18 @@ Fri Aug 24 18:08:37 2001 Irfan Pyarali <irfan@cs.wustl.edu> - (destroy_threadpool_i): We now shutdown the reactors in the thread pool, wait for the threads in the pool to exit, finalize the resources in the pool, and only then delete - the thread pool. + the thread pool. + + - (TAO_RT_New_Leader_Generator::no_leaders_available): This + method is called by the leader followers class when it is + out of threads to run the event loop. + + If this lane has support for dynamic threads, we grab the + Thread Pool Manager lock, check if the current number of + threads in this lane does not exceed the <static> + + <dynamic> number of threads specified by the user. If it + does not exceed <static> + <dynamic>, one dynamic thread + is created. * tao/RTCORBA/RT_Protocols_Hooks.cpp (set_default_server_protocol_policy): Don't include all the @@ -330,6 +341,14 @@ Fri Aug 24 18:08:37 2001 Irfan Pyarali <irfan@cs.wustl.edu> TAO_RT_Protocols_Hooks into the service configurator - it is already done in TAO_RT_ORBInitializer::pre_init. + * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp + * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h + * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i + + RT manager which manages multiple set of resources + associated with each thread lane and has a default set of + lane resources. + * tao/RTCORBA/RT_Current.h: * tao/RTCORBA/RT_Mutex.h: * tao/RTCORBA/RT_ORB.h: @@ -531,14 +550,6 @@ Fri Aug 24 18:08:37 2001 Irfan Pyarali <irfan@cs.wustl.edu> resources and approximates these resources being in the ORB Core. - * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp - * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h - * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i - - RT manager which manages multiple set of resources - associated with each thread lane and has a default set of - lane resources. - * tao/Endpoint.h (TAO_Endpoint): Changed default <priority> value in constructor to <TAO_INVALID_PRIORITY> instead of -1. @@ -603,6 +614,7 @@ Fri Aug 24 18:08:37 2001 Irfan Pyarali <irfan@cs.wustl.edu> * tao/CORBALOC_Parser.cpp (make_stub_from_mprofile): * tao/Stub.cpp (set_policy_overrides): * tao/Object.cpp (operator>>): + * tao/IORManipulation/IORManipulation.cpp: No need to pass ORB_Core::create_stub() a pointer to the ORB_Core. @@ -618,6 +630,11 @@ Fri Aug 24 18:08:37 2001 Irfan Pyarali <irfan@cs.wustl.edu> with the servant. The default resolver simply does what was done before which is to check the <is_collocated_> flag on the object. The RT resolver is more interesting. + + * tao/Leader_Follower.cpp (elect_new_leader): When we are out + of leader threads and there are no event loop threads + waiting and there are no followers available, we call on the + new leader generator class to create us a new leader thread. * tao/Makefile: * tao/Makefile.bor: @@ -748,10 +765,25 @@ Fri Aug 24 18:08:37 2001 Irfan Pyarali <irfan@cs.wustl.edu> * tao/PortableServer/MessagingS.cpp: * tao/PortableServer/PolicyS.cpp: * tao/PortableServer/Strategized_Object_Proxy_Broker.cpp: + * orbsvcs/IFR_Service/IFR_BaseS.cpp: + * orbsvcs/IFR_Service/IFR_BasicS.cpp: + * orbsvcs/IFR_Service/IFR_ComponentsS.cpp: + * orbsvcs/IFR_Service/IFR_ExtendedS.cpp: + * tao/Domain/DomainS.cpp: Passed environment variable to TAO_ORB_Core::collocation_strategy(). + * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp: + + - make_mprofile() was replaced by endpoint_count() and + fill_profile(). + + - Access the acceptor registry through the lane resources + rather than through the ORB Core. + + - Include "tao/Thread_Lane_Resources.h". + * tests/RTCORBA/Policy_Combinations: New test added that combines and tests several RT policies in different ways. @@ -1091,12 +1123,48 @@ Fri Aug 24 18:08:37 2001 Irfan Pyarali <irfan@cs.wustl.edu> Removed PortableServer and RTPortableServer libraries since they are not needed. + * tests/TAO_Tests.dsw: + * tests/Collocation/Coll_Test_Stubs.bor: + * tests/Collocation/Coll_Test_Stubs.dsp: + * tests/Collocation/Coll_Tester.cpp: + * tests/Collocation/Coll_Tester.h: + * tests/Collocation/Collocation.bor: + * tests/Collocation/Collocation.cpp: + * tests/Collocation/Collocation.dsp: + * tests/Collocation/Collocation.dsw: + * tests/Collocation/Collocation_Test_Stubs.bor: + * tests/Collocation/Collocation_Test_Stubs.dsp: + * tests/Collocation/Collocation_Tester.cpp: + * tests/Collocation/Collocation_Tester.h: + * tests/Collocation/Diamond.bor: + * tests/Collocation/Diamond.dsp: + * tests/Collocation/Makefile.bor: + * tests/Collocation/Makefile.test: + * tests/Collocation/README: + * tests/Connection_Purging/client.bor: + * tests/Connection_Purging/client.cpp: + * tests/Connection_Purging/client.dsp: + * tests/Connection_Purging/server.bor: + * tests/Connection_Purging/server.cpp: + * tests/Connection_Purging/server.dsp: + * tests/DLL_ORB/Test_Client_Module.dsp: + * tests/DLL_ORB/Test_Server_Module.dsp: + * tests/DLL_ORB/client.dsp: + * tests/DLL_ORB/server.dsp: + * tests/Faults/middle.dsp: + * tests/Multiple/Client.dsp: + * tests/Multiple/Server.dsp: + * tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.dsw: + + Made a bunch of small changes to make code and makefiles + consistent. + * docs/rtcorba/features.html: * docs/rtcorba/status.html: * docs/rtcorba/issues.html: Updated RTCORBA documentation to reflect new thread-pool - support. + support. Also added new issues that need to be addressed. * docs/Options.html: Added documentation for new -ORBScopePolicy option. |