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

[t...@freenetproject.org]

Author: toad
Date: 2006-08-01 18:43:42 +0000 (Tue, 01 Aug 2006)
New Revision: 9840

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
   trunk/freenet/src/freenet/node/PacketSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
917: Maybe fix resumable inserts.

Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2006-07-31 19:30:04 UTC (rev 9839)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2006-08-01 18:43:42 UTC (rev 9840)
@@ -16,7 +16,6 @@
 import freenet.support.SimpleFieldSet;
 import freenet.support.io.Bucket;
 import freenet.support.io.CannotCreateFromFieldSetException;
-import freenet.support.io.NullBucket;
 import freenet.support.io.SerializableToFieldSetBucket;
 import freenet.support.io.SerializableToFieldSetBucketUtil;

@@ -240,7 +239,10 @@
                                block.put("Finished", finished);
                        }
                        Bucket data = dataBlocks[i];
-                       if(data instanceof SerializableToFieldSetBucket) {
+                       if(data == null && finished) {
+                               // Ignore
+                               Logger.minor(this, "Could not save to disk: 
null");
+                       } else if(data instanceof SerializableToFieldSetBucket) 
{
                                SimpleFieldSet tmp = 
((SerializableToFieldSetBucket)data).toFieldSet();
                                if(tmp == null) {
                                        Logger.minor(this, "Could not save to 
disk: "+data);

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2006-07-31 19:30:04 UTC 
(rev 9839)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2006-08-01 18:43:42 UTC 
(rev 9840)
@@ -301,7 +301,11 @@
                                                Runnable r = (Runnable) o;
                                                jobsToRun.add(r);
                                        }
-                               } else break;
+                               } else {
+                                       // FIXME how accurately do we want 
ticker jobs to be scheduled?
+                                       // FIXME can they wait the odd 200ms?
+                                       break;
+                               }
                }
         }


Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-31 19:30:04 UTC (rev 
9839)
+++ trunk/freenet/src/freenet/node/Version.java 2006-08-01 18:43:42 UTC (rev 
9840)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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