r3820 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-23 16:13:16 +0100 (Mon, 23 Feb 2009)
New Revision: 3820

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_hash.c
Log:
Fix up broken SVN merge

Modified: branches/2.0/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_hash.c	2009-02-23 15:10:35 UTC (rev 3819)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_hash.c	2009-02-23 15:13:16 UTC (rev 3820)
@@ -434,12 +434,11 @@
 	}
 	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);
 	}