diff options
Diffstat (limited to 'TAO/tao/PortableServer/POA.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/POA.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index e0fa15357a5..17db3459747 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -1215,6 +1215,11 @@ TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id, ACE_THROW (PortableServer::POA::ObjectNotActive ()); } + // ... if the object has been deactivated already then just return + // immediately ... + if (active_object_map_entry->deactivated_ != 0) + return; + // Decrement the reference count. CORBA::UShort new_count = --active_object_map_entry->reference_count_; @@ -4194,7 +4199,7 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key, data = this->orb_core_.create_stub_object (key, type_id, client_exposed_policies._retn (), - this->accepor_filter_, + this->acceptor_filter_, ACE_TRY_ENV); ACE_CHECK_RETURN (0); |