Author: dbkr
Date: 2006-03-05 18:15:38 +0000 (Sun, 05 Mar 2006)
New Revision: 8167
Modified:
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/pluginmanager/PluginManager.java
Log:
499: Correct fix for not saving loaded plugins back to config file - call
SubConfig.finishedInitialization()!
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-05 16:49:31 UTC (rev
8166)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-05 18:15:38 UTC (rev
8167)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 498;
+ private static final int buildNumber = 499;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 475;
Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2006-03-05
16:49:31 UTC (rev 8166)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2006-03-05
18:15:38 UTC (rev 8167)
@@ -84,6 +84,8 @@
//System.err.println("Load: " +
StringArrOption.decode(fns[i]));
startPlugin(StringArrOption.decode(fns[i]));
}
+
+ pmconfig.finishedInitialization();
/*System.err.println("=================================");
pmconfig.finishedInitialization();
fns = pmconfig.getStringArr("loadplugin");
@@ -96,6 +98,7 @@
private String getConfigLoadString() {
StringBuffer out = new StringBuffer();
Iterator it = getPlugins().iterator();
+
if (it.hasNext())
out.append(StringArrOption.encode(((PluginInfoWrapper)it.next()).getFilename()));
while (it.hasNext())
@@ -105,11 +108,6 @@
}
private void saveConfig() {
- try {
- pmconfig.set("loadplugin", this.getConfigLoadString());
- } catch (InvalidConfigValueException e) {
- Logger.error(this, "Failed to marshal plugin list to
config file!");
- }
node.config.store();
}
@@ -308,7 +306,6 @@
//System.err.println("Real classname: " + realClass);
}
-
cls = cl.loadClass(realClass);
} catch (Exception e) {
