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

[t...@freenetproject.org]

Author: toad
Date: 2006-07-25 14:39:04 +0000 (Tue, 25 Jul 2006)
New Revision: 9748

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileInserter.java
   trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
   trunk/freenet/src/freenet/node/Version.java
Log:
894: Fix persistent requests.

Modified: trunk/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserter.java       
2006-07-25 14:11:45 UTC (rev 9747)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserter.java       
2006-07-25 14:39:04 UTC (rev 9748)
@@ -13,7 +13,6 @@
 import freenet.keys.FreenetURI;
 import freenet.support.Bucket;
 import freenet.support.BucketTools;
-import freenet.support.Fields;
 import freenet.support.Logger;
 import freenet.support.SimpleFieldSet;
 import freenet.support.compress.Compressor;
@@ -209,6 +208,7 @@

                if(countDataBlocks > 32)
                        parent.onMajorProgress();
+               parent.notifyClients();

        }


Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2006-07-25 14:11:45 UTC (rev 9747)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2006-07-25 14:39:04 UTC (rev 9748)
@@ -112,8 +112,6 @@
                        boolean blockFinished = 
Fields.stringToBool(blockFS.get("Finished"), false);
                        if(blockFinished && dataURIs[i] == null)
                                throw new ResumeException("Block "+i+" of 
"+segNo+" finished but no URI");
-                       if(blockFinished && !encoded)
-                               throw new ResumeException("Block "+i+" of 
"+segNo+" finished but not encoded");
                        if(!blockFinished) {
                                // Read data
                                SimpleFieldSet bucketFS = 
blockFS.subset("Data");
@@ -275,7 +273,7 @@
                                parent.parent.completedBlock(true);
                        }
                }
-               parent.parent.notifyClients();
+               //parent.parent.notifyClients();
                started = true;
                if(splitfileAlgo != null && !encoded) {
                        // Encode blocks

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-25 14:11:45 UTC (rev 
9747)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-25 14:39:04 UTC (rev 
9748)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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