[freenet-cvs] r19137 - trunk/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-04-10 14:05:25 +0000 (Thu, 10 Apr 2008)
New Revision: 19137

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
Log:
Detect it on resuming an insert too, so that nodes which have started such an 
insert can still start up without segfaulting!

Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2008-04-10 13:49:25 UTC (rev 19136)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2008-04-10 14:05:25 UTC (rev 19137)
@@ -222,6 +222,12 @@
                        }
                        splitfileAlgo = FECCodec.getCodec(splitfileAlgorithm,
                                        dataBlockCount, checkBlocks.length, 
ctx.executor);
+                       
+                       if(checkBlocks.length > dataBlocks.length) {
+                               // Work around 1135 bug.
+                               // FIXME remove
+                               throw new ResumeException("Detected 1135 insert 
bug, you must restart the insert");
+                       }
                } else {
                        Logger.normal(this, "Not encoded because no check 
blocks");
                        encoded = false;