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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-11-21 17:41:51 +0000 (Wed, 21 Nov 2007)
New Revision: 15909

Modified:
   trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
Log:
BookmarkToadlet: maybefix dbkr's NPE

Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java   
2007-11-21 17:26:21 UTC (rev 15908)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java   
2007-11-21 17:41:51 UTC (rev 15909)
@@ -186,7 +186,7 @@
             if (b.hasAnActivelink != hasAnActivelink) {
                 return false;
             }
-            if (!b.desc.equals(desc)) {
+            if (!(b.desc == null && desc == null) || !b.desc.equals(desc)) {
                 return false;
             }
             return true;