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

[t...@freenetproject.org]

Author: toad
Date: 2006-07-26 21:37:24 +0000 (Wed, 26 Jul 2006)
New Revision: 9787

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
   trunk/freenet/src/freenet/node/Version.java
Log:
911: More resumable insert fixes.

Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2006-07-26 21:20:00 UTC (rev 9786)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2006-07-26 21:37:24 UTC (rev 9787)
@@ -348,7 +348,6 @@
                try {
                        synchronized(this) {
                                if(encoded) return;
-                               encoded = true;
                        }
                        splitfileAlgo.encode(dataBlocks, checkBlocks, 
CHKBlock.DATA_LENGTH, blockInsertContext.persistentBucketFactory);
                        // Start the inserts
@@ -359,6 +358,9 @@
                        }
                        // Tell parent only after have started the inserts.
                        // Because of the counting.
+                       synchronized(this) {
+                               encoded = true;
+                       }
                        parent.encodedSegment(this);
                        onEncodedSegment();
                } catch (IOException e) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-26 21:20:00 UTC (rev 
9786)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-26 21:37:24 UTC (rev 
9787)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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