1 files changed, 13 insertions, 15 deletions

diff --git a/libtransport/src/hicn/transport/utils/content_store.cc b/libtransport/src/hicn/transport/utils/content_store.cc
index 4c7637dad..d48e16daf 100644
--- a/libtransport/src/hicn/transport/utils/content_store.cc
+++ b/libtransport/src/hicn/transport/utils/content_store.cc
@@ -34,29 +34,29 @@ void ContentStore::insert(
   std::unique_lock<std::mutex> lock(cs_mutex_);
 
   if (TRANSPORT_EXPECT_FALSE(content_store_hash_table_.size() !=
-                             lru_list_.size())) {
+                             fifo_list_.size())) {
     TRANSPORT_LOGW("Inconsistent size!!!!");
     TRANSPORT_LOGW("Hash Table: %zu |||| FIFO List: %zu",
-                   content_store_hash_table_.size(), lru_list_.size());
+                   content_store_hash_table_.size(), fifo_list_.size());
   }
 
   // Check if the content can be cached
   if (content_object->getLifetime() > 0) {
     if (content_store_hash_table_.size() >= max_content_store_size_) {
-      content_store_hash_table_.erase(lru_list_.back());
-      lru_list_.pop_back();
+      content_store_hash_table_.erase(fifo_list_.back());
+      fifo_list_.pop_back();
     }
 
     // Insert new item
 
     auto it = content_store_hash_table_.find(content_object->getName());
     if (it != content_store_hash_table_.end()) {
-      lru_list_.erase(it->second.second);
+      fifo_list_.erase(it->second.second);
       content_store_hash_table_.erase(content_object->getName());
     }
 
-    lru_list_.push_front(std::cref(content_object->getName()));
-    auto pos = lru_list_.begin();
+    fifo_list_.push_front(std::cref(content_object->getName()));
+    auto pos = fifo_list_.begin();
     content_store_hash_table_[content_object->getName()] = ContentStoreEntry(
         ObjectTimeEntry(content_object, std::chrono::steady_clock::now()), pos);
   }
@@ -67,13 +67,11 @@ const std::shared_ptr<ContentObject> &ContentStore::find(
   std::unique_lock<std::mutex> lock(cs_mutex_);
   auto it = content_store_hash_table_.find(interest.getName());
   if (it != content_store_hash_table_.end()) {
-    // if (std::chrono::duration_cast<std::chrono::milliseconds>(
-    //     std::chrono::steady_clock::now() - it->second.first.second).count()
-    //     < it->second.first.first->getLifetime() ||
-    //     it->second.first.first->getLifetime() ==
-    //     default_values::never_expire_time) {
-    return it->second.first.first;
-    // }
+    if (std::chrono::duration_cast<std::chrono::milliseconds>(
+            std::chrono::steady_clock::now() - it->second.first.second)
+            .count() < it->second.first.first->getLifetime()) {
+      return it->second.first.first;
+    }
   }
 
   return empty_reference_;
@@ -82,7 +80,7 @@ const std::shared_ptr<ContentObject> &ContentStore::find(
 void ContentStore::erase(const Name &exact_name) {
   std::unique_lock<std::mutex> lock(cs_mutex_);
   auto it = content_store_hash_table_.find(exact_name);
-  lru_list_.erase(it->second.second);
+  fifo_list_.erase(it->second.second);
   content_store_hash_table_.erase(exact_name);
 }