diff options
| author | michel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-01 14:26:47 +0000 |
|---|---|---|
| committer | michel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-01 14:26:47 +0000 |
| commit | 4477b845dd3791df5e475bf8d983ed7e9ab75ce0 (patch) | |
| tree | 580e043b62f4b022f998d1c06f0b1f651da793a7 | |
| parent | 6b4f48d097ced7d881609ed4e76db89208fe1c3b (diff) | |
| download | ATCD-4477b845dd3791df5e475bf8d983ed7e9ab75ce0.tar.gz | |
ChangeLogTag: Wed Jun 1 09:26:14 2005 Justin Michel <michel_j@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 28 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp | 10 |
2 files changed, 22 insertions, 16 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 08975736ee1..6fffb7404eb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 1 09:26:14 2005 Justin Michel <michel_j@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + + More fixes for exception macros. + Wed Jun 1 08:19:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PortableServer/Root_POA.cpp: @@ -8,24 +14,24 @@ Wed Jun 1 08:19:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> Wed Jun 1 02:50:28 2005 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * tests/Muxing/Receiver.h: + * tests/Muxing/Receiver.h: - Removed inheritance from PortableServer::RefcountServantBase - since reference is on by default. Please see "Thu May 26 - 10:17:12 UTC 2005 Johnny Willemsen - <jwillemsen@remedy.nl>". Many tests need to be changed - similarly. + Removed inheritance from PortableServer::RefcountServantBase + since reference is on by default. Please see "Thu May 26 + 10:17:12 UTC 2005 Johnny Willemsen + <jwillemsen@remedy.nl>". Many tests need to be changed + similarly. - * tests/Muxing/svc.conf: + * tests/Muxing/svc.conf: - Added -ORBConnectionCacheMax option to the test. + Added -ORBConnectionCacheMax option to the test. Tue May 31 22:43:10 2005 <cleeland_c@ociweb.com> - * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp (main): - * tests/IOR_Endpoint_Hostnames/generate_ior.cpp (main): + * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp (main): + * tests/IOR_Endpoint_Hostnames/generate_ior.cpp (main): - Fixed warnings related to unused args or variables. + Fixed warnings related to unused args or variables. Tue May 31 19:28:48 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index 94c0746e42c..7de23b61840 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -225,13 +225,13 @@ ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL) this->process_mgr_.close(); this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(try_block_1); if (! CORBA::is_nil(this->locator_.in()) && this->registration_token_ != 0) { this->locator_->unregister_activator (name_.c_str(), this->registration_token_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK(try_block_1); } } ACE_CATCH(CORBA::COMM_FAILURE, ex) @@ -247,7 +247,7 @@ ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: fini"); - ACE_RE_THROW; + ACE_RE_THROW_EX(try_block_1); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -255,7 +255,7 @@ ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY_EX(try_block_2) { this->orb_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(try_block_2); if (debug_ > 0) ACE_DEBUG((LM_DEBUG, "ImR Activator: Shut down successfully.\n")); @@ -263,7 +263,7 @@ ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: fini 2"); - ACE_RE_THROW; + ACE_RE_THROW_EX(try_block_2); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); |