Author: toad
Date: 2007-11-21 00:19:21 +0000 (Wed, 21 Nov 2007)
New Revision: 15895
Modified:
trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
Log:
Fix NPE
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2007-11-21 00:14:43 UTC (rev 15894)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2007-11-21 00:19:21 UTC (rev 15895)
@@ -74,7 +74,9 @@
//TODO: remove
String[] oldBookmarks;
try {
- oldBookmarks =
StringArrOption.stringToArray(oldConfig.get("fproxy.bookmarks"));
+ String o = oldConfig.get("fproxy.bookmarks");
+ if(o == null) oldBookmarks = null;
+ else oldBookmarks =
StringArrOption.stringToArray(o);
} catch (URLEncodedFormatException e) {
Logger.error(this, "Not possible to migrate:
caught "+e, e);
oldBookmarks = null;
@@ -88,6 +90,7 @@
SimpleFieldSet sfs = SimpleFieldSet.readFrom(bookmarksFile,
false, true);
readBookmarks(MAIN_CATEGORY, sfs);
}
+ storeBookmarks();
} catch (MalformedURLException mue) {
} catch (IOException ioe) {
