diff options
author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-29 17:45:14 +0000 |
---|---|---|
committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-29 17:45:14 +0000 |
commit | 464a083439db2a9553d1037f8a965aeb6c27a7df (patch) | |
tree | ff069fe21a02d74a4ad137889215d5a2d8da612d /net | |
parent | 9db08f1270a6ca637ea72b0230125d726441d128 (diff) | |
download | chromium_src-464a083439db2a9553d1037f8a965aeb6c27a7df.zip chromium_src-464a083439db2a9553d1037f8a965aeb6c27a7df.tar.gz chromium_src-464a083439db2a9553d1037f8a965aeb6c27a7df.tar.bz2 |
Http cache: revert dumping the transaction key.
TBR=darin
TEST=none
BUG=9952
Review URL: http://codereview.chromium.org/159591
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r-- | net/http/http_cache.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index d55ab70..a45c1ba 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -1597,20 +1597,16 @@ void HttpCache::DeactivateEntry(ActiveEntry* entry) { size_t readers_size = local_entry.readers.size(); size_t pending_size = local_entry.pending_queue.size(); - std::string key = entry->disk_entry->GetKey(); - ActiveEntriesMap::iterator it = active_entries_.find(key); + ActiveEntriesMap::iterator it = + active_entries_.find(entry->disk_entry->GetKey()); if (it == active_entries_.end() || it->second != entry || local_entry.will_process_pending_queue || local_entry.doomed || local_entry.writer || readers_size || pending_size || deleted_) { bool local_mem_flag = in_memory_cache_; ActiveEntriesSet::iterator it2 = doomed_entries_.find(entry); - char local_key[64]; - int key_length = key.size(); - base::strlcpy(local_key, key.c_str(), sizeof(local_key)); CHECK(it2 == doomed_entries_.end()); CHECK(!deleted_); CHECK(local_mem_flag); - CHECK(key_length); CHECK(false); } @@ -1681,9 +1677,6 @@ void HttpCache::DoneWithEntry(ActiveEntry* entry, Transaction* trans) { char local_transaction[sizeof(*trans)]; memcpy(local_transaction, trans, sizeof(*trans)); - char local_key[64]; - base::strlcpy(local_key, trans->key().c_str(), sizeof(local_key)); - // Assume that this is not a successful write. DoneWritingToEntry(entry, false); } else { |