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

[t...@freenetproject.org]

Author: toad
Date: 2006-03-29 22:46:52 +0000 (Wed, 29 Mar 2006)
New Revision: 8359

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
589: Fix an NPE if logging is disabled.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-03-29 22:38:52 UTC (rev 
8358)
+++ trunk/freenet/src/freenet/node/Node.java    2006-03-29 22:46:52 UTC (rev 
8359)
@@ -80,6 +80,7 @@
 import freenet.store.FreenetStore;
 import freenet.support.BucketFactory;
 import freenet.support.Fields;
+import freenet.support.FileLoggerHook;
 import freenet.support.HexUtil;
 import freenet.support.ImmutableByteArrayWrapper;
 import freenet.support.LRUHashtable;
@@ -673,7 +674,8 @@
                Logger.normal(this, s);
                System.err.println(s);
                testnetEnabled = false;
-               logConfigHandler.getFileLoggerHook().deleteAllOldLogFiles();
+               FileLoggerHook flh = logConfigHandler.getFileLoggerHook();
+               if(flh != null) flh.deleteAllOldLogFiles();
         }

         if(wasTestnet != testnetEnabled) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-29 22:38:52 UTC (rev 
8358)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-29 22:46:52 UTC (rev 
8359)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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