Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv22945/src/freenet/node
Modified Files:
Tag: ngrouting
Main.java NodeConfigUpdater.java Node.java
Log Message:
Fix for class initialization order, see Sun BugID 4419673 for a discussion around the
issue
Index: Main.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/Main.java,v
retrieving revision 1.234.2.9
retrieving revision 1.234.2.10
diff -u -r1.234.2.9 -r1.234.2.10
--- Main.java 21 Aug 2003 00:26:47 -0000 1.234.2.9
+++ Main.java 26 Aug 2003 23:04:34 -0000 1.234.2.10
@@ -192,8 +192,7 @@
}
args = sw.getArgs(); // remove switches recognized so far
-
- params = new Params(Node.config.getOptions());
+ params = new Params(Node.getConfig().getOptions());
// attempt to load config file
String paramFileString = sw.getParam("paramFile");
@@ -259,7 +258,7 @@
// kind of user permissions
if (params.getBoolean("publicNode")) {
Main.publicNode = true;
-
Node.config.addOption("mainport.params.servlet.7.params.sfDisableWriteToDisk", 1,
true, 4181);
+
Node.getConfig().addOption("mainport.params.servlet.7.params.sfDisableWriteToDisk", 1,
true, 4181);
}
// set up runtime logging
@@ -2268,7 +2267,7 @@
System.out.println("");
System.out.println("Configurable options");
System.out.println("--------------------");
- Node.config.printUsage(System.out);
+ Node.getConfig().printUsage(System.out);
System.out.println("");
System.out.println("Command-line switches");
System.out.println("---------------------");
@@ -2323,7 +2322,7 @@
out.println("These can reside either in the configuration file " +
"or be given as command line arguments.");
out.println("<hr>");
- Core.config.printManual(out);
+ Core.getConfig().printManual(out);
}
Index: NodeConfigUpdater.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/NodeConfigUpdater.java,v
retrieving revision 1.7.6.2
retrieving revision 1.7.6.3
diff -u -r1.7.6.2 -r1.7.6.3
--- NodeConfigUpdater.java 7 Aug 2003 01:50:49 -0000 1.7.6.2
+++ NodeConfigUpdater.java 26 Aug 2003 23:04:35 -0000 1.7.6.3
@@ -60,7 +60,7 @@
*/
public NodeConfigUpdater(int updateInterval) throws Throwable {
this.updateInterval = updateInterval;
- oldParams = new Params(Node.config.getOptions());
+ oldParams = new Params(Node.getConfig().getOptions());
lastModified = Main.paramFile.lastModified();
oldParams.readParams(Main.paramFile);
fireUpdates(oldParams);
@@ -81,7 +81,7 @@
synchronized(syncOb()) {
if (Main.paramFile.lastModified() == lastModified) return;
lastModified = Main.paramFile.lastModified();
- newParams = new Params(Node.config.getOptions());
+ newParams = new Params(Node.getConfig().getOptions());
try {
newParams.readParams(Main.paramFile);
} catch (Throwable e) {
Index: Node.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/Node.java,v
retrieving revision 1.193.2.10
retrieving revision 1.193.2.11
diff -u -r1.193.2.10 -r1.193.2.11
--- Node.java 21 Aug 2003 00:26:48 -0000 1.193.2.10
+++ Node.java 26 Aug 2003 23:04:35 -0000 1.193.2.11
@@ -49,7 +49,7 @@
public static String sysName = System.getProperty("os.name");
static {
-
+ Config config = getConfig();
// internal defaults
config.addOption("rtMaxRefs", 1, 50, 1300); // 50 refs/node
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
