[freenet-cvs] r15237 - trunk/freenet/src/freenet/clients/http/bookmark

[t...@freenetproject.org]

Author: toad
Date: 2007-09-21 16:26:19 +0000 (Fri, 21 Sep 2007)
New Revision: 15237

Modified:
   trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
Log:
clarify and possibly fix logic

Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java   
2007-09-21 16:25:58 UTC (rev 15236)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java   
2007-09-21 16:26:19 UTC (rev 15237)
@@ -158,8 +158,12 @@
                if(o instanceof BookmarkItem) {
                        BookmarkItem b = (BookmarkItem) o;
                        if(!super.equals(o)) return false;
-                       if(!b.key.equals(key) || 
b.key.getKeyType().equals("USK") && 
-                                       
b.key.setSuggestedEdition(key.getSuggestedEdition()).equals(key)) return false;
+                       if(!b.key.equals(key)) {
+                               if(b.key.getKeyType().equals("USK")) {
+                                       
if(!b.key.setSuggestedEdition(key.getSuggestedEdition()).equals(key))
+                                               return false;
+                               } else return false;
+                       }
                        if(b.alerts != alerts) return false; // Belongs to a 
different node???
                        return true;
                } else return false;