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

[t...@freenetproject.org]

Author: toad
Date: 2007-11-28 12:18:36 +0000 (Wed, 28 Nov 2007)
New Revision: 16005

Modified:
   trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
Log:
Fix NPE when no oldConfig

Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java        
2007-11-28 07:59:34 UTC (rev 16004)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java        
2007-11-28 12:18:36 UTC (rev 16005)
@@ -77,7 +77,8 @@
                     "Frost", true, node.alerts));

             //TODO: remove
-            String[] oldBookmarks;
+            String[] oldBookmarks = null;
+            if(oldConfig != null) {
             try {
                 String o = oldConfig.get("fproxy.bookmarks");
                 if (o == null) {
@@ -89,6 +90,7 @@
                 Logger.error(this, "Not possible to migrate: caught " + e, e);
                 oldBookmarks = null;
             }
+            }
             if (oldBookmarks != null) {
                 migrateOldBookmarks(oldBookmarks);
                 storeBookmarks();