r2214 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-30 15:02:58 +0100 (Tue, 30 Oct 2007)
New Revision: 2214

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
Log:
r2208 was correct but incomplete.  It is possible for a session to reach
cnt_done() without a VCL reference, if we never got a request on that
connection.  However, a session that reaches cnt_again() will never have
a VCL reference, so the assertion there is incorrect.


Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2007-10-30 13:42:52 UTC (rev 2213)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2007-10-30 14:02:58 UTC (rev 2214)
@@ -88,7 +88,7 @@
 	int i;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	AZ(sp->vcl);
 	AZ(sp->obj);
 	assert(sp->xid == 0);
 
@@ -191,7 +191,7 @@
 	int i;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_ORNULL(sp->vcl, VCL_CONF_MAGIC);
 
 	AZ(sp->obj);
 	AZ(sp->bereq);