r4055 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2009-05-09 12:26:29 +0200 (Sat, 09 May 2009)
New Revision: 4055

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_hash.c
Log:
Check that object has a ban before we unbusy it.



Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2009-05-09 10:02:22 UTC (rev 4054)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2009-05-09 10:26:29 UTC (rev 4055)
@@ -573,6 +573,7 @@
 	if (sp->obj->objhead != NULL) {
 		VRY_Create(sp);
 		EXP_Insert(sp->obj);
+		AN(sp->obj->ban);
 		HSH_Unbusy(sp);
 	}
 	sp->acct_req.fetch++;

Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-05-09 10:02:22 UTC (rev 4054)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-05-09 10:26:29 UTC (rev 4055)
@@ -593,6 +593,7 @@
 	CHECK_OBJ(oh, OBJHEAD_MAGIC);
 
 	AN(ObjIsBusy(o));
+	AN(o->ban);
 	assert(o->objcore->obj == o);
 	assert(o->refcnt > 0);
 	assert(oh->refcnt > 0);