diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-08-26 16:16:25 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-08-26 16:16:25 +0000 |
commit | 85bb3b1977f58a780ff5fe1e03a5f21ab8ad52b5 (patch) | |
tree | fc474af48d5f3955d07b35da7bdf6ff38060e518 /TAO | |
parent | 496bfd59a7df5a03fc71b251092b2beb7a5f2797 (diff) | |
download | ATCD-85bb3b1977f58a780ff5fe1e03a5f21ab8ad52b5.tar.gz |
ChangeLogTag:Tue Aug 26 09:15:44 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 112b9c9e385..76776bf3af3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Aug 26 09:13:43 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp (fini): + + Fixed emulated exception macro usage. + Tue Aug 26 09:06:19 2003 Ossama Othman <ossama@dre.vanderbilt.edu> * TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index 75a841772c0..32a1b305e00 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -425,16 +425,16 @@ TAO_CEC_Event_Loader::fini (void) // Do Nothing } ACE_ENDTRY; + ACE_CHECK_RETURN (-1); - - ACE_TRY + ACE_TRY_EX (foo) { // Unbind the Naming Service if (this->bind_to_naming_service_) { this->naming_context_->unbind (this->channel_name_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX (foo); } // Since we created them, we also have to delete them. @@ -452,6 +452,7 @@ TAO_CEC_Event_Loader::fini (void) return -1; } ACE_ENDTRY; + ACE_CHECK_RETURN (-1); return 0; } |