diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-07-13 21:11:16 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-07-13 21:11:16 +0000 |
| commit | 6f7ca7dc55d8c669c1bc473f73c573da6e68a7a0 (patch) | |
| tree | 522c9cccbe7e6a36163a164e399ed9adc0bc6b82 | |
| parent | b6f9b851c72df10e2b0e8e709ad70e0286816ee4 (diff) | |
| download | ATCD-6f7ca7dc55d8c669c1bc473f73c573da6e68a7a0.tar.gz | |
ChangeLogTag:Fri Jul 13 15:59:45 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp | 5 | ||||
| -rw-r--r-- | THANKS | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index ae41cebba37..aff0f24a466 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Jul 13 16:07:04 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp: Make sure + that this->ior_multicast is non-NULL in ~ImplRepo_i() before + using it to lookup in the reactor. Thanks to Victor Chernenko + <v_chernenko@hotmail.com> for reporting this. + Thu Jul 13 14:30:16 2001 Paul Calabrese <calabrese_p@ociweb.com> * examples/AMI/FL_Callback/AMI_Peer.dsp: diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp index 06cabeb3d13..d84e55f4d7f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp @@ -1126,8 +1126,9 @@ ImplRepo_i::~ImplRepo_i (void) ACE_Reactor *reactor = orb->orb_core ()->reactor (); // Register event handler for the ior multicast. - if (reactor->remove_handler (this->ior_multicast_, - ACE_Event_Handler::READ_MASK) == -1) + if (this->ior_multicast_ + && reactor->remove_handler (this->ior_multicast_, + ACE_Event_Handler::READ_MASK) == -1) if (OPTIONS::instance ()->debug () > 0) ACE_DEBUG ((LM_DEBUG, "Implementation Repository: cannot remove handler\n")); @@ -1291,6 +1291,7 @@ Glen Coakley <gcoakley@mqsoftware.com> Scott Plant <splant@softhome.net> Wilfried Reinoehl <Wilfried.Reinoehl@WiredMinds.de> Sangeetha Ramadurai <Sangeetha.Ramadurai@geind.ge.com> +Victor Chernenko <v_chernenko@hotmail.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile |