diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-19 08:02:52 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-19 08:02:52 +0000 |
| commit | d9e7859115ef1d5ec0f1c0a829b697354990a8a4 (patch) | |
| tree | 384c03f0891bbd738983cd5477ac803253f7aaee /TAO/tao/ORB_Core.cpp | |
| parent | 03b65689794604a55162d73e8a5a4ccb5827b307 (diff) | |
| download | ATCD-d9e7859115ef1d5ec0f1c0a829b697354990a8a4.tar.gz | |
ChangeLogTag Fri Aug 19 07:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/ORB_Core.cpp')
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index bce6daa608b..e0bc632002e 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -57,6 +57,7 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" +#include "ace/Message_Block.h" #if TAO_HAS_INTERCEPTORS == 1 # include "tao/ClientRequestInterceptor_Adapter.h" @@ -79,7 +80,7 @@ ACE_RCSID (tao, CORBA::Environment& TAO_default_environment (void) { - return *TAO_TSS_RESOURCES::instance ()->default_environment_; + return *TAO_TSS_Resources::instance ()->default_environment_; } // **************************************************************** @@ -195,7 +196,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) policy_factory_registry_ (0), orbinitializer_registry_ (0), #if (TAO_HAS_INTERCEPTORS == 1) - pi_current_ (0), + pi_current_ (CORBA::Object::_nil ()), client_request_interceptor_adapter_ (0), server_request_interceptor_adapter_ (0), #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -1303,15 +1304,15 @@ TAO_ORB_Core::set_resource_factory (const char *resource_factory_name) void TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory) { - if (TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ != 0) + if (TAO_TSS_Resources::instance ()->gui_resource_factory_ != 0) { ACE_DEBUG ((LM_WARNING, "TAO (%P|%t) - Deleting old gui_resource_factory.\n")); - delete TAO_TSS_RESOURCES::instance ()->gui_resource_factory_; + delete TAO_TSS_Resources::instance ()->gui_resource_factory_; } - TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ = gui_resource_factory; + TAO_TSS_Resources::instance ()->gui_resource_factory_ = gui_resource_factory; } void @@ -1394,7 +1395,7 @@ TAO_ORB_Core::resource_factory (void) TAO::GUIResource_Factory * TAO_ORB_Core::gui_resource_factory (void) { - return TAO_TSS_RESOURCES::instance ()->gui_resource_factory_; + return TAO_TSS_Resources::instance ()->gui_resource_factory_; } @@ -2083,7 +2084,6 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion #if (TAO_HAS_INTERCEPTORS == 1) CORBA::release (this->pi_current_); - this->pi_current_ = 0; // For the sake of consistency. #endif /* TAO_HAS_INTERCEPTORS == 1 */ } ACE_CATCHALL @@ -2257,7 +2257,7 @@ TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL) { ACE_Service_Config::process_directive ( ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader", - "TAO", + "TAO_PI", "_make_TAO_PICurrent_Loader", "")); loader = @@ -2270,7 +2270,7 @@ TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL) loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->pi_current_ = dynamic_cast <TAO::PICurrent *> (pi); + this->pi_current_ = pi; } } @@ -2844,13 +2844,13 @@ TAO_ORB_Core::get_cached_policy_including_current ( CORBA::Environment * TAO_ORB_Core::default_environment (void) const { - return TAO_TSS_RESOURCES::instance ()->default_environment_; + return TAO_TSS_Resources::instance ()->default_environment_; } void TAO_ORB_Core::default_environment (CORBA::Environment *env) { - TAO_TSS_RESOURCES::instance ()->default_environment_ = env; + TAO_TSS_Resources::instance ()->default_environment_ = env; } void |