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

[t...@freenetproject.org]

Author: toad
Date: 2005-11-05 21:28:16 +0000 (Sat, 05 Nov 2005)
New Revision: 7488

Modified:
   trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java
   trunk/freenet/src/freenet/node/RequestHandler.java
   trunk/freenet/src/freenet/node/TextModeClientInterface.java
   trunk/freenet/src/freenet/node/Version.java
Log:
Compile fixes.
Now compiles; probably runs.
But does not use the new client code yet.

Modified: trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java       
2005-11-05 21:26:26 UTC (rev 7487)
+++ trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java       
2005-11-05 21:28:16 UTC (rev 7488)
@@ -185,7 +185,7 @@
                     node2 = random.nextInt(NUMBER_OF_NODES);
                 } while(node2 == node1);
                 Node fetchNode = nodes[node2];
-                block = fetchNode.getCHK(chk);
+                block = fetchNode.getCHK(chk, false);
                 if(block == null) {
                     Logger.error(RealNodeRequestInsertTest.class, "Fetch 
FAILED from "+node2);
                     requestsAvg.report(0.0);

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2005-11-05 21:26:26 UTC 
(rev 7487)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2005-11-05 21:28:16 UTC 
(rev 7488)
@@ -49,7 +49,7 @@
         Message accepted = DMT.createFNPAccepted(uid);
         source.send(accepted);

-        Object o = node.makeRequestSender(key, htl, uid, source, closestLoc);
+        Object o = node.makeRequestSender(key, htl, uid, source, closestLoc, 
false);
         if(o instanceof CHKBlock) {
             CHKBlock block = (CHKBlock) o;
             Message df = DMT.createFNPDataFound(uid, block.getHeader());

Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2005-11-05 
21:26:26 UTC (rev 7487)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2005-11-05 
21:28:16 UTC (rev 7488)
@@ -82,7 +82,7 @@
     }

     /**
-     * 
+     * Process a single command.
      */
     private void processLine(BufferedReader reader) throws 
UnsupportedEncodingException {
         String line;
@@ -114,7 +114,7 @@
             }
             CHKBlock block;
             // Fetch, possibly from other node.
-            block = n.getCHK(chk);
+            block = n.getCHK(chk, false);
             if(block == null) {
                 System.out.println("Not found in store: "+chk.getURI());
             } else {
@@ -149,7 +149,7 @@
             }
             CHKBlock block;
             // Fetch, possibly from other node.
-            block = n.getCHK(chk);
+            block = n.getCHK(chk, false);
             if(block == null) {
                 System.out.println("Not found in store: "+chk.getURI());
             } else {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-05 21:26:26 UTC (rev 
7487)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-05 21:28:16 UTC (rev 
7488)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 139;
+       public static final int buildNumber = 140;

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