Author: nextgens
Date: 2008-04-14 02:37:31 +0000 (Mon, 14 Apr 2008)
New Revision: 19286
Modified:
trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
Log:
should be final
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2008-04-14 02:24:57 UTC (rev 19285)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2008-04-14 02:37:31 UTC (rev 19286)
@@ -23,7 +23,7 @@
public class BookmarkManager {
- public static SimpleFieldSet DEFAULT_BOOKMARKS = null;
+ public static final SimpleFieldSet DEFAULT_BOOKMARKS;
private final NodeClientCore node;
private final USKUpdatedCallback uskCB = new USKUpdatedCallback();
public static final BookmarkCategory MAIN_CATEGORY = new
BookmarkCategory("/");
@@ -33,6 +33,7 @@
private boolean isSavingBookmarks = false;
static {
String name =
"freenet/clients/http/staticfiles/defaultbookmarks.dat";
+ SimpleFieldSet defaultBookmarks = null;
InputStream in = null;
try {
ClassLoader loader = ClassLoader.getSystemClassLoader();
@@ -40,11 +41,12 @@
// Returns null on lookup failures:
in = loader.getResourceAsStream(name);
if(in != null)
- DEFAULT_BOOKMARKS = SimpleFieldSet.readFrom(in,
false, false);
+ defaultBookmarks = SimpleFieldSet.readFrom(in,
false, false);
} catch(Exception e) {
Logger.error("BookmarkManager", "Error while loading
the default bookmark file from " + name + " :" + e.getMessage(), e);
} finally {
Closer.close(in);
+ DEFAULT_BOOKMARKS = defaultBookmarks;
}
}
