Author: toad
Date: 2008-06-17 15:14:17 +0000 (Tue, 17 Jun 2008)
New Revision: 20399
Modified:
branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java
Log:
More exceptions
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-17
15:12:17 UTC (rev 20398)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-17
15:14:17 UTC (rev 20399)
@@ -73,11 +73,12 @@
* Create one for a global-queued request not made by FCP.
* @throws IdentifierCollisionException
* @throws NotAllowedException
+ * @throws IOException
*/
public ClientGet(FCPClient globalClient, FreenetURI uri, boolean
dsOnly, boolean ignoreDS,
int maxSplitfileRetries, int maxNonSplitfileRetries,
long maxOutputLength,
short returnType, boolean persistRebootOnly, String
identifier, int verbosity, short prioClass,
- File returnFilename, File returnTempFilename, FCPServer
server) throws IdentifierCollisionException, NotAllowedException,
FetchException {
+ File returnFilename, File returnTempFilename, FCPServer
server) throws IdentifierCollisionException, NotAllowedException, IOException {
super(uri, identifier, verbosity, null, globalClient, prioClass,
(persistRebootOnly ?
ClientRequest.PERSIST_REBOOT : ClientRequest.PERSIST_FOREVER),
null, true);
@@ -106,17 +107,10 @@
} else {
targetFile = null;
tempFile = null;
- try {
if(persistenceType == PERSIST_FOREVER)
ret =
server.core.persistentTempBucketFactory.makeEncryptedBucket();
else
ret = fctx.bucketFactory.makeBucket(-1);
- } catch (IOException e) {
- Logger.error(this, "Cannot create bucket for
temp storage: "+e, e);
- getter = null;
- returnBucket = null;
- throw new
FetchException(FetchException.BUCKET_ERROR, e);
- }
}
returnBucket = ret;
getter = new ClientGetter(this,
server.core.requestStarters.chkFetchScheduler,
server.core.requestStarters.sskFetchScheduler, uri, fctx, priorityClass,
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java 2008-06-17
15:12:17 UTC (rev 20398)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java 2008-06-17
15:14:17 UTC (rev 20399)
@@ -575,8 +575,9 @@
* @param persistence The persistence type.
* @param returnType The return type.
* @throws NotAllowedException
+ * @throws IOException
*/
- public void makePersistentGlobalRequest(FreenetURI fetchURI, String
expectedMimeType, String persistenceTypeString, String returnTypeString,
ObjectContainer container) throws NotAllowedException {
+ public void makePersistentGlobalRequest(FreenetURI fetchURI, String
expectedMimeType, String persistenceTypeString, String returnTypeString,
ObjectContainer container) throws NotAllowedException, IOException {
boolean persistence =
persistenceTypeString.equalsIgnoreCase("reboot");
short returnType =
ClientGetMessage.parseReturnType(returnTypeString);
File returnFilename = null, returnTempFilename = null;
@@ -654,7 +655,7 @@
}
private void innerMakePersistentGlobalRequest(FreenetURI fetchURI,
boolean persistRebootOnly, short returnType, String id, File returnFilename,
- File returnTempFilename, ObjectContainer container)
throws IdentifierCollisionException, NotAllowedException {
+ File returnTempFilename, ObjectContainer container)
throws IdentifierCollisionException, NotAllowedException, IOException {
final ClientGet cg =
new ClientGet(persistRebootOnly ? globalRebootClient :
globalForeverClient, fetchURI, defaultFetchContext.localRequestOnly,
defaultFetchContext.ignoreStore,
QUEUE_MAX_RETRIES, QUEUE_MAX_RETRIES,
