From 5a0517589fca0b67a0016a8cdb8e330308e49751 Mon Sep 17 00:00:00 2001 From: des Date: Tue, 30 Oct 2007 14:02:58 +0000 Subject: [PATCH] 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 --- varnish-cache/bin/varnishd/cache_center.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); -- 2.39.5