Author: toad
Date: 2007-09-14 14:49:02 +0000 (Fri, 14 Sep 2007)
New Revision: 15162
Modified:
trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
Log:
Fix NPE
Modified: trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
2007-09-14 14:39:23 UTC (rev 15161)
+++ trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
2007-09-14 14:49:02 UTC (rev 15162)
@@ -33,7 +33,8 @@
if(o instanceof Bookmark) {
Bookmark b = (Bookmark) o;
if(!b.name.equals(name)) return false;
- if(!b.desc.equals(desc)) return false;
+ // Compensate for nulls
+
if(!String.valueOf(b.desc).equals(String.valueOf(desc))) return false;
if(b.privateBookmark != privateBookmark) return false;
return true;
} else return false;
