Author: toad
Date: 2006-08-16 19:30:33 +0000 (Wed, 16 Aug 2006)
New Revision: 10125
Modified:
trunk/freenet/src/freenet/client/async/ClientPutter.java
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Don't include a bogus File when creating the ClientPut from the form.
Modified: trunk/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientPutter.java 2006-08-16
19:16:58 UTC (rev 10124)
+++ trunk/freenet/src/freenet/client/async/ClientPutter.java 2006-08-16
19:30:33 UTC (rev 10125)
@@ -116,6 +116,11 @@
currentState = null;
oldProgress = null;
}
+ if(super.failedBlocks > 0 || super.fatallyFailedBlocks > 0 ||
super.successfulBlocks < super.totalBlocks) {
+ Logger.error(this, "Failed blocks: "+failedBlocks+",
Fatally failed blocks: "+fatallyFailedBlocks+
+ ", Successful blocks:
"+successfulBlocks+", Total blocks: "+totalBlocks+" but success?! on "+this+"
from "+state,
+ new Exception("debug"));
+ }
client.onSuccess(this);
}
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2006-08-16 19:16:58 UTC (rev 10124)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2006-08-16 19:30:33 UTC (rev 10125)
@@ -313,7 +313,9 @@
((SplitHandler)newMetaPutter).start(metaFS, true);
}
} catch (ResumeException e) {
- // Ignore, it will be reconstructed
later
+ newMetaPutter = null;
+ Logger.error(this, "Caught "+e, e);
+ // Will be reconstructed later
}
}
fs.removeSubset("MetadataPutter");
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2006-08-16
19:16:58 UTC (rev 10124)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2006-08-16
19:30:33 UTC (rev 10125)
@@ -166,7 +166,7 @@
Bucket copiedBucket =
core.persistentEncryptedTempBucketFactory.makeBucket(file.getData().size());
BucketTools.copy(file.getData(), copiedBucket);
try {
- ClientPut clientPut = new
ClientPut(fcp.getGlobalClient(), insertURI, identifier, Integer.MAX_VALUE,
RequestStarter.BULK_SPLITFILE_PRIORITY_CLASS, ClientRequest.PERSIST_FOREVER,
null, false, !compress, -1, ClientPutMessage.UPLOAD_FROM_DIRECT, new
File(file.getFilename()), file.getContentType(), copiedBucket, null);
+ ClientPut clientPut = new
ClientPut(fcp.getGlobalClient(), insertURI, identifier, Integer.MAX_VALUE,
RequestStarter.BULK_SPLITFILE_PRIORITY_CLASS, ClientRequest.PERSIST_FOREVER,
null, false, !compress, -1, ClientPutMessage.UPLOAD_FROM_DIRECT, null,
file.getContentType(), copiedBucket, null);
clientPut.start();
fcp.forceStorePersistentRequests();
} catch (IdentifierCollisionException e) {
