diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-20 17:50:09 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-20 17:50:09 +0000 |
| commit | 6960ce41e6d742387dd64136d09eb822304ef50d (patch) | |
| tree | e525bff1d716f4a9b884898cb87db5ef7d1200cb /TAO/tao/ORBInitializer_Registry.cpp | |
| parent | 7910287d755f04a87eeae6e9e9614cf313da35cd (diff) | |
| download | ATCD-6960ce41e6d742387dd64136d09eb822304ef50d.tar.gz | |
ChangeLogTag:Thu Feb 20 09:07:56 2003 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO/tao/ORBInitializer_Registry.cpp')
| -rw-r--r-- | TAO/tao/ORBInitializer_Registry.cpp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 0d5e0aa25ac..b50dfb3c427 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -21,7 +21,8 @@ PortableInterceptor::register_orb_initializer ( // Using ACE_Static_Object_Lock::instance() precludes // <register_orb_initializer> from being called within a static // object CTOR. - ACE_MT (ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, + ACE_MT (ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, + guard, *ACE_Static_Object_Lock::instance ())); // Make sure TAO's singleton manager is initialized. @@ -32,7 +33,7 @@ PortableInterceptor::register_orb_initializer ( ACE_TEXT ("Unable to pre-initialize TAO\n"))); } - CORBA_ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Make sure the following is done after the global ORB @@ -40,7 +41,7 @@ PortableInterceptor::register_orb_initializer ( TAO_ORBInitializer_Registry::instance ()->register_orb_initializer ( init - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // ------------------------------------------------------------------ @@ -50,13 +51,6 @@ TAO_ORBInitializer_Registry::TAO_ORBInitializer_Registry (void) { } -TAO_ORBInitializer_Registry::~TAO_ORBInitializer_Registry (void) -{ - size_t initializer_count = this->initializers_.size (); - for (size_t i = 0; i < initializer_count; ++i) - CORBA::release (this->initializers_[i]); -} - void TAO_ORBInitializer_Registry::register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init @@ -65,21 +59,18 @@ TAO_ORBInitializer_Registry::register_orb_initializer ( if (!CORBA::is_nil (init)) { // Increase the length of the ORBInitializer array by one. - size_t cur_len = this->initializers_.size (); - size_t new_len = cur_len + 1; + const size_t cur_len = this->initializers_.size (); + const size_t new_len = cur_len + 1; if (this->initializers_.size (new_len) != 0) ACE_THROW (CORBA::INTERNAL ()); - // @@ Do we need to duplicate the reference to the - // ORBInitializer? - // Add the given ORBInitializer to the sequence. this->initializers_[cur_len] = PortableInterceptor::ORBInitializer::_duplicate (init); } else ACE_THROW (CORBA::INV_OBJREF ( - CORBA_SystemException::_tao_minor_code ( + CORBA::SystemException::_tao_minor_code ( TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); @@ -90,7 +81,7 @@ TAO_ORBInitializer_Registry::pre_init ( PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL) { - size_t initializer_count = this->initializers_.size (); + const size_t initializer_count = this->initializers_.size (); for (size_t i = 0; i < initializer_count; ++i) { this->initializers_[i]->pre_init (info @@ -104,7 +95,7 @@ TAO_ORBInitializer_Registry::post_init ( PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL) { - size_t initializer_count = this->initializers_.size (); + const size_t initializer_count = this->initializers_.size (); for (size_t i = 0; i < initializer_count; ++i) { this->initializers_[i]->post_init (info |