Commit bfd90a2b authored by Tollef Fog Heen's avatar Tollef Fog Heen

Fix up broken SVN merge

git-svn-id: http://www.varnish-cache.org/svn/branches/2.0@3820 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 54b32350
......@@ -434,12 +434,11 @@ HSH_Deref(struct object **oo)
}
assert(o->refcnt > 0);
r = --o->refcnt;
if (oh != NULL)
else
hsh_rush(oh);
if (oh != NULL) {
if (!r)
VTAILQ_REMOVE(&oh->objects, o, list);
else
hsh_rush(oh);
Lck_Unlock(&oh->mtx);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment