Author: toad
Date: 2007-09-14 14:59:58 +0000 (Fri, 14 Sep 2007)
New Revision: 15164
Modified:
trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
Log:
Bookmarks are equal if they're the same USK even with different editions
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
2007-09-14 14:57:20 UTC (rev 15163)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
2007-09-14 14:59:58 UTC (rev 15164)
@@ -158,7 +158,8 @@
if(o instanceof BookmarkItem) {
BookmarkItem b = (BookmarkItem) o;
if(!super.equals(o)) return false;
- if(!b.key.equals(key)) return false;
+ if(!b.key.equals(key) ||
b.key.getKeyType().equals("USK") &&
+
b.key.setSuggestedEdition(key.getSuggestedEdition()).equals(key)) return false;
if(b.alerts != alerts) return false; // Belongs to a
different node???
return true;
} else return false;
