From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Tue, 30 Oct 2007 14:02:58 +0000 (+0000)
Subject: r2208 was correct but incomplete.  It is possible for a session to reach
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a0517589fca0b67a0016a8cdb8e330308e49751;p=varnish

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.


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2214 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index fff4b079..fdd889a7 100644
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -88,7 +88,7 @@ cnt_again(struct sess *sp)
 	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 @@ cnt_done(struct sess *sp)
 	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);