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 6c9922a4139dc753a84d5cfb4790016dd3919b22..d7d5cbf93eb8ad5250e5eca7248f3753f62045cf 100644 (file)
--- 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) {