[freenet-CVS] freenet/src/freenet/config Setup.java,1.6.6.1,1.6.6.2

[Niklas Bergh]

Update of /cvsroot/freenet/freenet/src/freenet/config
In directory sc8-pr-cvs1:/tmp/cvs-serv22945/src/freenet/config

Modified Files:
      Tag: ngrouting
        Setup.java 
Log Message:
Fix for class initialization order, see Sun BugID 4419673 for a discussion around the 
issue

Index: Setup.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/config/Setup.java,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -u -r1.6.6.1 -r1.6.6.2
--- Setup.java  7 Aug 2003 01:50:48 -0000       1.6.6.1
+++ Setup.java  26 Aug 2003 23:04:34 -0000      1.6.6.2
@@ -34,7 +34,7 @@
     public static void main(String[] args) {
 
         Params switches = new Params(options.getOptions());
-        Params params = new Params(Node.config.getOptions());
+        Params params = new Params(Node.getConfig().getOptions());
         switches.readArgs(args);
         ReadInputStream in = new ReadInputStream(System.in);
         boolean expert = switches.getParam("expert") != null;
@@ -48,7 +48,7 @@
             System.out.println("Options:");
             options.printUsage(System.out);
             System.out.println("Settings: ");
-            Node.config.printUsage(System.out);
+            Node.getConfig().printUsage(System.out);
             System.exit(1);
         } else 
             filename = switches.getArg(0);
@@ -67,10 +67,10 @@
         Setup setup;
         if (silent)
             setup = new Setup(System.out, new File(filename), params,
-                              Node.config.getOptions());
+                              Node.getConfig().getOptions());
         else
             setup = new Setup(in, System.out, new File(filename), expert, 
-                              params, Node.config.getOptions());
+                              params, Node.getConfig().getOptions());
 
         try {
             if (switches.getParam("update") == null)

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs