[freenet-cvs] r7590 - in trunk/freenet/src/freenet: client node

[t...@freenetproject.org]

Author: toad
Date: 2005-11-25 00:40:25 +0000 (Fri, 25 Nov 2005)
New Revision: 7590

Modified:
   trunk/freenet/src/freenet/client/RetryTracker.java
   trunk/freenet/src/freenet/client/SplitInserter.java
   trunk/freenet/src/freenet/node/Version.java
Log:
210:
Splitfile insert bugfix.

Modified: trunk/freenet/src/freenet/client/RetryTracker.java
===================================================================
--- trunk/freenet/src/freenet/client/RetryTracker.java  2005-11-24 22:07:04 UTC 
(rev 7589)
+++ trunk/freenet/src/freenet/client/RetryTracker.java  2005-11-25 00:40:25 UTC 
(rev 7590)
@@ -177,6 +177,7 @@
                runningBlocks.remove(block);
                int levelNumber = block.getRetryCount();
                levelNumber++;
+               Logger.minor(this, "Non-fatal error on "+block+" -> 
"+levelNumber);
                if(levelNumber > maxLevel) {
                        failedBlocksTooManyRetries.add(block);
                        Logger.minor(this, "Finished with "+block);

Modified: trunk/freenet/src/freenet/client/SplitInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/SplitInserter.java 2005-11-24 22:07:04 UTC 
(rev 7589)
+++ trunk/freenet/src/freenet/client/SplitInserter.java 2005-11-25 00:40:25 UTC 
(rev 7590)
@@ -167,6 +167,8 @@
                int x = 0;
                for(int i=0;i<segments.length;i++) {
                        FreenetURI[] segURIs = segments[i].getCheckURIs();
+                       if(x + segURIs.length > countCheckBlocks) 
+                               throw new IllegalStateException("x="+x+", 
segURIs="+segURIs.length+", countCheckBlocks="+countCheckBlocks);
                        System.arraycopy(segURIs, 0, uris, x, segURIs.length);
                        x += segURIs.length;
                }
@@ -223,6 +225,7 @@
                if(dataBlocks < segmentSize || segmentSize == -1) {
                        // Single segment
                        InsertSegment onlySeg = new 
InsertSegment(splitfileAlgorithm, origDataBlocks, blockSize, ctx.bf, 
getCHKOnly, 0);
+                       countCheckBlocks = onlySeg.checkBlocks.length;
                        segs.add(onlySeg);
                } else {
                        int j = 0;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-24 22:07:04 UTC (rev 
7589)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-25 00:40:25 UTC (rev 
7590)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

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

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 208;
+       public static final int lastGoodBuild = 210;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;