[master] 20d3eca Move a misplaced assert.

Poul-Henning Kamp phk at FreeBSD.org
Tue May 13 10:44:58 CEST 2014


commit 20d3ecae26e8b9f522c04b8759e8e5b90df5789a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 13 08:44:32 2014 +0000

    Move a misplaced assert.
    
    Fixes	#1478

diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 9acf893..cd48671 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -458,10 +458,10 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
 		exp_oc->refcnt++;
 
 		if (!busy_found) {
-			AZ(req->hash_ignore_busy);
 			*bocp = hsh_insert_busyobj(wrk, oh);
 			retval = HSH_EXPBUSY;
 		} else {
+			AZ(req->hash_ignore_busy);
 			retval = HSH_EXP;
 		}
 		if (oh->hits < LONG_MAX)



More information about the varnish-commit mailing list