diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-22 00:12:01 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-22 00:12:01 +0000 |
| commit | 4ee15b8b38919f390187c86bb0c4c00b4f59cd9f (patch) | |
| tree | 6b3aa18660129648f41cfff661203b02956a2699 /ace/Strategies_T.cpp | |
| parent | ce4b3d9fff3603caeddff6afbf93d3bfd10b1834 (diff) | |
| download | ATCD-4ee15b8b38919f390187c86bb0c4c00b4f59cd9f.tar.gz | |
ChangeLogTag:Wed Jul 21 18:38:00 1999 Irfan Pyarali <irfan@cs.wustl.edu>
Diffstat (limited to 'ace/Strategies_T.cpp')
| -rw-r--r-- | ace/Strategies_T.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp index d449af737be..f435942e284 100644 --- a/ace/Strategies_T.cpp +++ b/ace/Strategies_T.cpp @@ -407,6 +407,8 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cach if (this->delete_lock_) delete this->lock_; + delete this->reverse_lock_; + if (this->delete_creation_strategy_) delete this->creation_strategy_; this->delete_creation_strategy_ = 0; @@ -424,7 +426,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cach // Close down all cached service handlers. CONNECTION_MAP_ENTRY *entry; - for (CONNECTION_MAP_ITERATOR iterator (connection_cache_); + for (CONNECTION_MAP_ITERATOR iterator (connection_map_); iterator.next (entry); iterator.advance ()) { @@ -626,7 +628,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c else { // Insert the new SVC_HANDLER instance into the cache. - if (this->connection_cache_.bind (search_addr, + if (this->connection_map_.bind (search_addr, sh, entry) == -1) return -1; @@ -924,7 +926,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::purge_i ( // The wonders and perils of ACT CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act; - return this->connection_cache_.unbind (entry); + return this->connection_map_.unbind (entry); } template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int @@ -1008,14 +1010,14 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find (ACE ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Null_Mutex> - CONNECTION_CACHE_BUCKET_ITERATOR; + CONNECTION_MAP_BUCKET_ITERATOR; - CONNECTION_CACHE_BUCKET_ITERATOR iterator (this->connection_cache_, - search_addr); + CONNECTION_MAP_BUCKET_ITERATOR iterator (this->connection_map_, + search_addr); - CONNECTION_CACHE_BUCKET_ITERATOR end (this->connection_cache_, - search_addr, - 1); + CONNECTION_MAP_BUCKET_ITERATOR end (this->connection_map_, + search_addr, + 1); for (; iterator != end; |