[freenet-cvs] r8431 - trunk/freenet/src/freenet/node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-04-02 12:58:15 +0000 (Sun, 02 Apr 2006)
New Revision: 8431

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
612:

Needed to save me a headache with the installer

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-04-02 12:43:30 UTC (rev 
8430)
+++ trunk/freenet/src/freenet/node/Node.java    2006-04-02 12:58:15 UTC (rev 
8431)
@@ -578,7 +578,12 @@
                                        }
        });

-       int port = nodeConfig.getInt("listenPort");
+       int port=-1;
+       try{
+               port=nodeConfig.getInt("listenPort");
+       }catch (Exception e){
+               port=-1;
+       }

        UdpSocketManager u = null;

@@ -896,11 +901,10 @@
                                        }
         });
         myName = nodeConfig.getString("name");
-       
+           
+        nodeConfig.finishedInitialization();
         writeNodeFile();

-        nodeConfig.finishedInitialization();
-        
         // FIXME make all the below arbitrary constants configurable!

                archiveManager = new ArchiveManager(MAX_ARCHIVE_HANDLERS, 
MAX_CACHED_ARCHIVE_DATA, MAX_ARCHIVE_SIZE, MAX_ARCHIVED_FILE_SIZE, 
MAX_CACHED_ELEMENTS, random, tempFilenameGenerator);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-02 12:43:30 UTC (rev 
8430)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-02 12:58:15 UTC (rev 
8431)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 611;
+       private static final int buildNumber = 612;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 591;