---------------------
PatchSet 4297 
Date: 2007/04/20 23:07:31
Author: dwsquid
Branch: squid3-largeobj
Tag: (none) 
Log:
leftover merge bug from objectification of StoreEntry::swapOut()

Members: 
	src/store_swapout.cc:1.19.2.4->1.19.2.5 

Index: squid3/src/store_swapout.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/store_swapout.cc,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -u -r1.19.2.4 -r1.19.2.5
--- squid3/src/store_swapout.cc	20 Apr 2007 22:53:51 -0000	1.19.2.4
+++ squid3/src/store_swapout.cc	20 Apr 2007 23:07:31 -0000	1.19.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_swapout.cc,v 1.19.2.4 2007/04/20 22:53:51 dwsquid Exp $
+ * $Id: store_swapout.cc,v 1.19.2.5 2007/04/20 23:07:31 dwsquid Exp $
  *
  * DEBUG: section 20    Storage Manager Swapout Functions
  * AUTHOR: Duane Wessels
@@ -234,7 +234,7 @@
     }
 
 #endif
-    if (e->swap_status == SWAPOUT_WRITING)
+    if (swap_status == SWAPOUT_WRITING)
         assert(mem_obj->inmem_lo <=  mem_obj->objectBytesOnDisk() );
 
     if (!swapOutAble())