[or-cvs] r9801: Fix a lame assert, I hope. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-03-11 17:10:54 -0400 (Sun, 11 Mar 2007)
New Revision: 9801

Modified:
   tor/trunk/
   tor/trunk/src/or/routerlist.c
Log:
 r12538 at Kushana:  nickm | 2007-03-11 17:10:22 -0400
 Fix a lame assert, I hope.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12538] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-03-11 20:52:07 UTC (rev 9800)
+++ tor/trunk/src/or/routerlist.c	2007-03-11 21:10:54 UTC (rev 9801)
@@ -1709,7 +1709,7 @@
   }
   ri_tmp = digestmap_set(rl->identity_map,
                          ri_new->cache_info.identity_digest, ri_new);
-  tor_assert(!ri_tmp);
+  tor_assert(!ri_tmp || ri_tmp == ri_old);
   digestmap_set(rl->desc_digest_map,
           ri_new->cache_info.signed_descriptor_digest, &(ri_new->cache_info));