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 fff4b07914d9f52890b34b82414b0cb71aaf4b6e..fdd889a76194bd49f98ce75601c523fe2d4ce494 100644 (file)
--- 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);