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

[t...@freenetproject.org]

Author: toad
Date: 2006-08-05 15:56:28 +0000 (Sat, 05 Aug 2006)
New Revision: 9905

Modified:
   trunk/freenet/src/freenet/node/RequestSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
929: Fix bug: We were caching all closest-to-target SSKs from requests. We 
should only cache them if they are both closest-to-target and from inserts.

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2006-08-05 15:45:37 UTC 
(rev 9904)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2006-08-05 15:56:28 UTC 
(rev 9905)
@@ -399,7 +399,7 @@
     private void finishSSK(PeerNode next) {
        try {
                        block = new SSKBlock(sskData, headers, (NodeSSK)key, 
false);
-                       node.store(block, resetNearestLoc);
+                       node.store(block, false);
                        if(node.random.nextInt(RANDOM_REINSERT_INTERVAL) == 0)
                                node.queueRandomReinsert(block);
                        finish(SUCCESS, next);
@@ -445,7 +445,7 @@
                                node.queueRandomReinsert(block);
        } else if (key instanceof NodeSSK) {
                try {
-                               node.store(new SSKBlock(data, headers, 
(NodeSSK)key, false), resetNearestLoc);
+                               node.store(new SSKBlock(data, headers, 
(NodeSSK)key, false), false);
                        } catch (KeyCollisionException e) {
                                Logger.normal(this, "Collision on "+this);
                        }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-08-05 15:45:37 UTC (rev 
9904)
+++ trunk/freenet/src/freenet/node/Version.java 2006-08-05 15:56:28 UTC (rev 
9905)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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