Don't need to check ENTRY_VALIDATED in client_side. It will be done

by the storage manager if we need to swap it in.

diff --git a/src/client_side.cc b/src/client_side.cc
index 848d37817e73317e6bd6a78d58e56bf66c67ef4c..501bfb18ef48ccb3e85429285ebbfbe849da7d4b 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.129 1997/10/20 22:59:43 wessels Exp $
+ * $Id: client_side.cc,v 1.130 1997/10/21 15:58:43 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -223,19 +223,12 @@ icpHandleIMSReply(void *data, char *buf, ssize_t size)
     if (entry->store_status == STORE_ABORTED) {
        debug(33, 3) ("icpHandleIMSReply: ABORTED '%s'\n", entry->url);
        /* We have an existing entry, but failed to validate it */
-       if (BIT_SET(entry->flag, ENTRY_REVALIDATE)) {
-           /* We can't send the old one, so send the abort message */
-           http->log_type = LOG_TCP_REFRESH_MISS;
-           storeUnregister(http->old_entry, http);
-           storeUnlockObject(http->old_entry);
-       } else {
-           /* Its okay to send the old one anyway */
-           http->log_type = LOG_TCP_REFRESH_FAIL_HIT;
-           storeUnregister(entry, http);
-           storeUnlockObject(entry);
-           entry = http->entry = http->old_entry;
-           entry->refcount++;
-       }
+       /* Its okay to send the old one anyway */
+       http->log_type = LOG_TCP_REFRESH_FAIL_HIT;
+       storeUnregister(entry, http);
+       storeUnlockObject(entry);
+       entry = http->entry = http->old_entry;
+       entry->refcount++;
     } else if (mem->reply->code == 0) {
        debug(33, 3) ("icpHandleIMSReply: Incomplete headers for '%s'\n",
            entry->url);