diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-03-23 02:09:08 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-03-23 02:09:08 +0000 |
| commit | e12c5dc1b462cf10276734f0bd11e0b2c545dac0 (patch) | |
| tree | 09b36767f8a9c12483600523f790791b55557463 | |
| parent | 24e4b7156cc87ef2c3231b3ef14e53b67018e269 (diff) | |
| download | ATCD-e12c5dc1b462cf10276734f0bd11e0b2c545dac0.tar.gz | |
ChangeLogTag: Thu Mar 22 20:08:05 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/POA.cpp | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 3f09911334a..f5120bd6168 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Thu Mar 22 20:08:05 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/PortableServer/POA.cpp: Backed out changes from Thu Mar 22 + 15:32:22 2001 Carlos O'Ryan <coryan@uci.edu>. + Thu Mar 22 15:32:22 2001 Carlos O'Ryan <coryan@uci.edu> * tao/PortableServer/POA.cpp (deactivate_object_i): diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index 17db3459747..e0fa15357a5 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -1215,11 +1215,6 @@ 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_; @@ -4199,7 +4194,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->acceptor_filter_, + this->accepor_filter_, ACE_TRY_ENV); ACE_CHECK_RETURN (0); |