---------------------
PatchSet 5280 
Date: 2002/10/07 15:34:48
Author: rbcollins
Branch: rbcollins_cxxtest
Tag: (none) 
Log:
simplify conditional

Members: 
	src/icp_v2.cc:1.1.2.4->1.1.2.5 

Index: squid/src/icp_v2.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/icp_v2.cc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- squid/src/icp_v2.cc	7 Oct 2002 15:33:27 -0000	1.1.2.4
+++ squid/src/icp_v2.cc	7 Oct 2002 15:34:48 -0000	1.1.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icp_v2.cc,v 1.1.2.4 2002/10/07 15:33:27 rbcollins Exp $
+ * $Id: icp_v2.cc,v 1.1.2.5 2002/10/07 15:34:48 rbcollins Exp $
  *
  * DEBUG: section 12    Internet Cache Protocol
  * AUTHOR: Duane Wessels
@@ -200,10 +200,8 @@
     int pad)
 {
     /* if store is rebuilding, return a UDP_HIT, but not a MISS */
-    if (store_dirs_rebuilding && opt_reload_hit_only) {
-	icpReallyCreateAndSend (ICP_MISS_NOFETCH, flags, url, reqnum, pad, fd, from);
-	return 1;
-    } else if (hit_only_mode_until > squid_curtime) {
+    if (store_dirs_rebuilding && opt_reload_hit_only ||
+	hit_only_mode_until > squid_curtime) {
 	icpReallyCreateAndSend (ICP_MISS_NOFETCH, flags, url, reqnum, pad, fd, from);
 	return 1;
     }