diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-12-13 12:35:08 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-12-13 12:35:08 +0000 |
| commit | 4dd36b633cddd90bfeb0e0b145120b7e3ce5651f (patch) | |
| tree | 0e5c2219a19a5c32d591242180ec2066ceff8668 | |
| parent | da43c09487d59dfe5fe9e298edd7403fe66fdca2 (diff) | |
| download | ATCD-4dd36b633cddd90bfeb0e0b145120b7e3ce5651f.tar.gz | |
ChangeLogTag: Tue Dec 13 12:34:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/Notify_Service/Notify_Service.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5f54cc78d25..6df34bd5fde 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Dec 13 12:34:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/Notify_Service/Notify_Service.cpp (shutdown): + Only unbind from the naming service when we have a valid object + reference to it. + Tue Dec 13 10:22:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Codeset_Manager_Factory_Base.h: diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index 9fb6903fc1a..182a27231ac 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -287,7 +287,7 @@ void TAO_Notify_Service_Driver::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Deactivate. - if (this->use_name_svc_) + if (this->use_name_svc_ && !CORBA::is_nil (this->naming_.in ())) { // Unbind from the naming service. CosNaming::Name_var name = |