From: wessels <>
Date: Sat, 25 Jul 1998 09:46:12 +0000 (+0000)
Subject: storeCleanup(): Check RELEASE_REQUEST *before* fileno<0 to catch the
X-Git-Tag: SQUID_3_0_PRE1~2978
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc085d45a7d77eef3a1359248beeb99ddf9b7329;p=thirdparty%2Fsquid.git

storeCleanup(): Check RELEASE_REQUEST *before* fileno<0 to catch the
'cancelled' objects from reloading.
---

diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc
index 6c9922a413..d7d5cbf93e 100644
--- a/src/store_rebuild.cc
+++ b/src/store_rebuild.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: store_rebuild.cc,v 1.42 1998/07/22 20:38:00 wessels Exp $
+ * $Id: store_rebuild.cc,v 1.43 1998/07/25 03:46:12 wessels Exp $
  *
  * DEBUG: section 20    Store Rebuild Routines
  * AUTHOR: Duane Wessels
@@ -595,12 +595,12 @@ storeCleanup(void *datanotused)
 	e = (StoreEntry *) link_ptr;
 	if (EBIT_TEST(e->flag, ENTRY_VALIDATED))
 	    continue;
-	if (e->swap_file_number < 0)
-	    continue;
 	if (EBIT_TEST(e->flag, RELEASE_REQUEST)) {
 	    storeRelease(e);
 	    continue;
 	}
+	if (e->swap_file_number < 0)
+	    continue;
 	if (opt_store_doublecheck) {
 	    struct stat sb;
 	    if (stat(storeSwapFullPath(e->swap_file_number, NULL), &sb) < 0) {