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

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-05-05 14:51:41 +0000 (Mon, 05 May 2008)
New Revision: 19768

Modified:
   trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
Log:
fix possible NPE


Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java   
2008-05-05 14:40:21 UTC (rev 19767)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java   
2008-05-05 14:51:41 UTC (rev 19768)
@@ -210,11 +210,13 @@
             if (b.hasAnActivelink != hasAnActivelink) {
                 return false;
             }
-           if(!(b.desc == null && desc == null)) {
+            if (b.desc == desc)
+                               return true;
+                       if (b.desc == null || desc == null)
+                               return false;
                if(!b.desc.equals(desc)) {
                        return false;
                }
-            }
             return true;
         } else {
             return false;