diff options
Diffstat (limited to 'TAO/tao/default_resource.cpp')
| -rw-r--r-- | TAO/tao/default_resource.cpp | 68 |
1 files changed, 6 insertions, 62 deletions
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index eb7066d9598..377dd8f8d91 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -213,6 +213,12 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) item->factory ( ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("IIOP_Factory")); this->protocol_factories_.insert (item); + + item = + new TAO_Protocol_Item ("UIOP_Factory"); + item->factory ( + ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("UIOP_Factory")); + this->protocol_factories_.insert (item); return 0; } @@ -255,8 +261,6 @@ rtype TAO_Default_Resource_Factory::methodname(void)\ IMPLEMENT_GET_METHOD(get_thr_mgr, ACE_Thread_Manager *, tm_) IMPLEMENT_GET_METHOD(get_acceptor_registry, TAO_Acceptor_Registry *, ar_) IMPLEMENT_GET_METHOD(get_connector_registry, TAO_Connector_Registry *, cr_) -IMPLEMENT_GET_METHOD(get_null_creation_strategy, TAO_NULL_CREATION_STRATEGY *, null_creation_strategy_) -IMPLEMENT_GET_METHOD(get_null_activation_strategy, TAO_NULL_ACTIVATION_STRATEGY *, null_activation_strategy_) // @@ TODO We may be changing the state of the global // Allocated_Resources structure, but without any locks? @@ -361,34 +365,6 @@ TAO_Default_Resource_Factory::object_adapter (void) return 0; } -TAO_CACHED_CONNECT_STRATEGY * -TAO_Default_Resource_Factory::get_cached_connect_strategy (void) -{ - // @@ Remove this use of ORB_Core_instance() from here!!!! - switch (this->resource_source_) - { - case TAO_GLOBAL: - if (GLOBAL_ALLOCATED::instance ()->cached_connect_strategy_ == 0) - { - ACE_NEW_RETURN (GLOBAL_ALLOCATED::instance ()->cached_connect_strategy_, - TAO_CACHED_CONNECT_STRATEGY (TAO_ORB_Core_instance ()->client_factory ()->create_client_creation_strategy ()), - 0); - } - return GLOBAL_ALLOCATED::instance ()->cached_connect_strategy_; - ACE_NOTREACHED (break); - case TAO_TSS: - if (TSS_ALLOCATED::instance ()->cached_connect_strategy_ == 0) - { - ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->cached_connect_strategy_, - TAO_CACHED_CONNECT_STRATEGY (TAO_ORB_Core_instance ()->client_factory ()->create_client_creation_strategy ()), - 0); - } - return TSS_ALLOCATED::instance ()->cached_connect_strategy_; - ACE_NOTREACHED (break); - } - return 0; -} - TAO_POA * TAO_Default_Resource_Factory::get_root_poa (void) { @@ -548,7 +524,6 @@ TAO_Default_Resource_Factory::create_input_cdr_data_block (size_t size) TAO_Allocated_Resources::TAO_Allocated_Resources (void) : r_ (0), object_adapter_ (0), - cached_connect_strategy_ (0), poa_(0), input_cdr_dblock_allocator_ (0), input_cdr_buffer_allocator_ (0), @@ -577,13 +552,6 @@ TAO_Allocated_Resources::~TAO_Allocated_Resources (void) this->output_cdr_buffer_allocator_->remove (); delete this->output_cdr_buffer_allocator_; - if (this->cached_connect_strategy_ != 0) - { - // Zap the creation strategy that we created earlier - delete this->cached_connect_strategy_->creation_strategy (); - delete this->cached_connect_strategy_; - } - delete this->object_adapter_; delete this->r_; @@ -620,18 +588,6 @@ template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX>; template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >; template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >; -template class ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>; -template class ACE_Creation_Strategy<TAO_Client_Connection_Handler>; -template class ACE_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>; -template class ACE_Strategy_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>; -template class ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_Client_Connection_Handler>; -template class ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>; -template class ACE_Recycling_Strategy<TAO_Client_Connection_Handler>; -template class ACE_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>; - -template class ACE_Node<TAO_Client_Connection_Handler *>; - template class ACE_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX>; template class ACE_TSS_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX>; template class ACE_TSS<TAO_Allocated_Resources>; @@ -646,18 +602,6 @@ template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> #pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> > #pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> > -#pragma instantiate ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, TAO_SOCK_ACCEPTOR> -#pragma instantiate ACE_Creation_Strategy<TAO_Client_Connection_Handler> -#pragma instantiate ACE_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR> -#pragma instantiate ACE_Strategy_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR> -#pragma instantiate ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO_Client_Connection_Handler> -#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler> -#pragma instantiate ACE_Recycling_Strategy<TAO_Client_Connection_Handler> -#pragma instantiate ACE_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR> - -#pragma instantiate ACE_Node<TAO_Client_Connection_Handler *> - #pragma instantiate ACE_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX> #pragma instantiate ACE_TSS_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX> #pragma instantiate ACE_TSS<TAO_Allocated_Resources> |