diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-12-04 22:26:51 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-12-04 22:26:51 +0000 |
| commit | fa7f5217e8fd2774d57aa9d8b6ea285e310d1c6b (patch) | |
| tree | 62bd89a8a79c6219155e187a987b9d1b10e5e6d7 | |
| parent | 85c3244b1644fbe447afe3959929d7804ddeb9ec (diff) | |
| download | ATCD-fa7f5217e8fd2774d57aa9d8b6ea285e310d1c6b.tar.gz | |
ChangeLogTag: Wed Dec 4 17:25:06 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Transport_Cache_Manager.cpp | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 65660db08f1..fa89abda827 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 4 17:25:06 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * tao/Transport_Cache_Manager.cpp (update_item) : Return -1 in + case the map entry is zero after holding the lock. Thanks to + Scott Harris for pointing this out. + Wed Dec 4 17:15:29 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tao/TAO_Server_Request.cpp: Fixed a typo in this "Tue Dec 3 diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp index 93dddaf34c2..883da08da18 100644 --- a/TAO/tao/Transport_Cache_Manager.cpp +++ b/TAO/tao/Transport_Cache_Manager.cpp @@ -306,13 +306,13 @@ TAO_Transport_Cache_Manager::update_entry (HASH_MAP_ENTRY *&entry) guard, *this->cache_lock_, -1)); - if (entry != 0) - { - TAO_Connection_Purging_Strategy *st = - this->purging_strategy_; + if (entry == 0) + return -1; - (void) st->update_item (entry->int_id_.transport ()); - } + TAO_Connection_Purging_Strategy *st = + this->purging_strategy_; + + (void) st->update_item (entry->int_id_.transport ()); return 0; } |