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

[t...@freenetproject.org]

Author: toad
Date: 2006-07-26 22:26:18 +0000 (Wed, 26 Jul 2006)
New Revision: 9788

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java
Log:
912: More fixes, but there are still problems with resumable inserts...

Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2006-07-26 21:37:24 UTC (rev 9787)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java        
2006-07-26 22:26:18 UTC (rev 9788)
@@ -239,19 +239,17 @@
                        if(started) {
                                block.put("Finished", finished);
                        }
-                       if(!finished) {
-                               Bucket data = dataBlocks[i];
-                               if(data instanceof 
SerializableToFieldSetBucket) {
-                                       SimpleFieldSet tmp = 
((SerializableToFieldSetBucket)data).toFieldSet();
-                                       if(tmp == null) {
-                                               Logger.minor(this, "Could not 
save to disk: "+data);
-                                               return null;
-                                       }
-                                       block.put("Data", tmp);
-                               } else {
-                                       Logger.minor(this, "Could not save to 
disk (not serializable to fieldset): "+data);
+                       Bucket data = dataBlocks[i];
+                       if(data instanceof SerializableToFieldSetBucket) {
+                               SimpleFieldSet tmp = 
((SerializableToFieldSetBucket)data).toFieldSet();
+                               if(tmp == null) {
+                                       Logger.minor(this, "Could not save to 
disk: "+data);
                                        return null;
                                }
+                               block.put("Data", tmp);
+                       } else {
+                               Logger.minor(this, "Could not save to disk (not 
serializable to fieldset): "+data);
+                               return null;
                        }
                        if(!block.isEmpty())
                                dataFS.put(Integer.toString(i), block);
@@ -276,10 +274,11 @@
                                                data instanceof 
SerializableToFieldSetBucket) {
                                        SimpleFieldSet tmp = 
((SerializableToFieldSetBucket)data).toFieldSet();
                                        if(tmp != null)
-                                               Logger.minor(this, "Could not 
serialize "+data+" - check block "+i+" of "+segNo);
-                                       block.put("Data", tmp);
+                                               Logger.error(this, "Could not 
serialize "+data+" - check block "+i+" of "+segNo);
+                                       else
+                                               block.put("Data", tmp);
                                } else if(encoded) {
-                                       Logger.minor(this, "Could not save to 
disk (null or not serializable to fieldset): "+data);
+                                       Logger.error(this, "Could not save to 
disk (null or not serializable to fieldset): "+data);
                                        return null;
                                }
                        }

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

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

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

Modified: trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java    2006-07-26 
21:37:24 UTC (rev 9787)
+++ trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java    2006-07-26 
22:26:18 UTC (rev 9788)
@@ -56,7 +56,10 @@

                extraDescription = fs.get("ExtraDescription");
                String euri = fs.get("ExpectedURI");
-               expectedURI = new FreenetURI(euri);
+               if(euri != null && euri.length() > 0)
+                       expectedURI = new FreenetURI(euri);
+               else
+                       expectedURI = null;
                SimpleFieldSet trackerSubset = fs.subset("Errors");
                if(trackerSubset != null) {
                        tracker = new FailureCodeTracker(true, trackerSubset);