[freenet-cvs] r8092 - in trunk/freenet/src/freenet: node store

[t...@freenetproject.org]

Author: toad
Date: 2006-02-21 19:32:16 +0000 (Tue, 21 Feb 2006)
New Revision: 8092

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
462:
Fix broken startup message.
Logging.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-02-21 19:02:58 UTC (rev 
8091)
+++ trunk/freenet/src/freenet/node/Node.java    2006-02-21 19:32:16 UTC (rev 
8092)
@@ -361,7 +361,6 @@
     public static void main(String[] args) throws IOException {
        if(args.length>1) {
                System.out.println("Usage: $ java freenet.node.Node 
<configFile>");
-               System.out.println("We recommend you move your old 
<filename>-<portnumber> files to <filename>, otherwise the node won't use 
them!");
                return;
        }


Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-02-21 19:02:58 UTC (rev 
8091)
+++ trunk/freenet/src/freenet/node/Version.java 2006-02-21 19:32:16 UTC (rev 
8092)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-02-21 
19:02:58 UTC (rev 8091)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-02-21 
19:32:16 UTC (rev 8092)
@@ -336,7 +336,7 @@
                DSAPublicKey block = null;

                        byte[] data = new byte[dataBlockSize];
-                       Logger.minor(this, "Reading from store... 
"+storeBlock.offset);
+                       Logger.minor(this, "Reading from store... 
"+storeBlock.offset+" ("+storeBlock.recentlyUsed+")");
                        synchronized(chkStore) {
                                
chkStore.seek(storeBlock.offset*(long)(dataBlockSize+headerBlockSize));
                                chkStore.readFully(data);
@@ -585,6 +585,8 @@
        }

        public Object entryToObject(TupleInput ti) {
+               if(Logger.shouldLog(Logger.DEBUG, this))
+                       Logger.debug(this, "Available: "+ti.available());
                long offset = ti.available() == 12 ? ti.readInt() : 
ti.readLong();
                long lastAccessed = ti.readLong();