diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-24 03:41:00 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-24 03:41:00 +0000 |
| commit | 7204190f1378b2b59f2f2360e3b0e00f887176f9 (patch) | |
| tree | e368e164e6de1311fe0a6df2c00fab49fb39943f | |
| parent | 02172bd51eea855b37c9fb642d61a5d2b4451395 (diff) | |
| download | ATCD-7204190f1378b2b59f2f2360e3b0e00f887176f9.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Container_Base.h | 5 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp | 12 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h | 3 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp | 5 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Swapping_Container.h | 3 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp | 1 |
6 files changed, 16 insertions, 13 deletions
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h index 809cde90216..c01e5150e78 100644 --- a/TAO/CIAO/DAnCE/ciao/Container_Base.h +++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h @@ -207,9 +207,8 @@ namespace CIAO Dynamic_Component_Servant_Base* servant ACE_ENV_ARG_DECL) = 0; - virtual void delete_servant_map (PortableServer::ObjectId &oid, - Dynamic_Component_Servant_Base* servant - ACE_ENV_ARG_DECL) = 0; + virtual void delete_servant_map (PortableServer::ObjectId &oid + ACE_ENV_ARG_DECL) = 0; // Install a component servant. CORBA::Object_ptr install_component (PortableServer::Servant p, diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp index 2d8495334a1..c2798a31f8e 100644 --- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp +++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp @@ -57,11 +57,17 @@ namespace CIAO } void Dynamic_Component_Activator::delete_servant_map - (PortableServer::ObjectId &oid, - Dynamic_Component_Servant_Base* servant + (PortableServer::ObjectId &oid ACE_ENV_ARG_DECL) { - this->servant_map_.bind (oid, servant); + Dynamic_Component_Servant_Base* servant = 0; + if (this->servant_map_.unbind (oid, servant) != 0) + { + ACE_DEBUG ((LM_DEBUG, "Invalid object reference\n")); + return; + } + + return; } } diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h index 0cf93eedc32..7f4285daf12 100644 --- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h +++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h @@ -81,8 +81,7 @@ namespace CIAO Dynamic_Component_Servant_Base* servant ACE_ENV_ARG_DECL); - void delete_servant_map (PortableServer::ObjectId &oid, - Dynamic_Component_Servant_Base* servant + void delete_servant_map (PortableServer::ObjectId &oid ACE_ENV_ARG_DECL); private: diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp index 6f5b35e5b61..087e269815b 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp @@ -112,11 +112,10 @@ namespace CIAO void Swapping_Container::delete_servant_map - (PortableServer::ObjectId &oid, - Dynamic_Component_Servant_Base* servant + (PortableServer::ObjectId &oid ACE_ENV_ARG_DECL) { - this->dsa_->add_servant_map (oid, servant); + this->dsa_->delete_servant_map (oid); } void diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h index 37b5f224e70..3372d356b3e 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h @@ -71,8 +71,7 @@ namespace CIAO Dynamic_Component_Servant_Base* servant ACE_ENV_ARG_DECL); - virtual void delete_servant_map (PortableServer::ObjectId &oid, - Dynamic_Component_Servant_Base* servant + virtual void delete_servant_map (PortableServer::ObjectId &oid ACE_ENV_ARG_DECL); PortableServer::POA_ptr the_home_servant_POA (void) const; diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp index 01e8a6d83c8..f27244f1a95 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp @@ -95,6 +95,7 @@ namespace CIAO { servant->destroy (oid); } + this->container_->delete_servant_map (oid); } // Operations for keyless home interface. |