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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-11-21 00:41:04 +0000 (Wed, 21 Nov 2007)
New Revision: 15898

Modified:
   trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
Log:
BookmarkToadlet: fix previous commit.

Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java        
2007-11-21 00:36:09 UTC (rev 15897)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java        
2007-11-21 00:41:04 UTC (rev 15898)
@@ -73,16 +73,20 @@

             //TODO: remove
             String[] oldBookmarks;
-                       try {
-                               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;
-                       }
+            try {
+                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;
+            }
             if (oldBookmarks != null) {
                 migrateOldBookmarks(oldBookmarks);
+                storeBookmarks();
             }

             if (bookmarksFile.exists() && bookmarksFile.canRead() && 
bookmarksFile.length() > 0) {
@@ -90,8 +94,6 @@
                 SimpleFieldSet sfs = SimpleFieldSet.readFrom(bookmarksFile, 
false, true);
                 readBookmarks(MAIN_CATEGORY, sfs);
             }
-            storeBookmarks();
-
         } catch (MalformedURLException mue) {
         } catch (IOException ioe) {
             Logger.error(this, "Error reading the bookmark file (" + 
bookmarksFile.toString() + "):" + ioe.getMessage(), ioe);