Merge remote-tracking branch 'thynix/fix-fcp-blob-downloading' into next

hyphanet · Apr 10, 2016 · f9a7c24 · f9a7c24
2 parents adcc779 + b2f66cd
commit f9a7c24
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/freenet/client/async/BinaryBlobWriter.java b/src/freenet/client/async/BinaryBlobWriter.java
@@ -61,6 +61,7 @@ public BinaryBlobWriter(Bucket out) {
 		_binaryBlobKeysAddedAlready = new HashSet<Key>();
 		_buckets = null;
 		_bf = null;
+		assert out != null;
 		_out = out;
 		_isSingleBucket = true;
 	}

diff --git a/src/freenet/clients/fcp/ClientGet.java b/src/freenet/clients/fcp/ClientGet.java
@@ -205,7 +205,7 @@ public ClientGet(PersistentRequestClient globalClient, FreenetURI uri, boolean d
 		}
 		this.extensionCheck = extensionCheck;
 		this.initialMetadata = null;
-		getter = makeGetter(ret);
+		getter = makeGetter(core, ret);
 	}
 
 	public ClientGet(FCPConnectionHandler handler, ClientGetMessage message, 
@@ -265,10 +265,25 @@ else if(!(handler.allowDDAFrom(targetFile, true)))
 		}
 		this.extensionCheck = extensionCheck;
 		initialMetadata = message.getInitialMetadata();
-		getter = makeGetter(ret);
+        try {
+            getter = makeGetter(core, ret);
+        } catch (IOException e) {
+            Logger.error(this, "Cannot create bucket for temporary storage: "+e, e);
+            // This is *not* a FetchException since we don't register it: it's a protocol error.
+            throw new MessageInvalidException(ProtocolErrorMessage.INTERNAL_ERROR,
+                    "Cannot create bucket for temporary storage (out of disk space?): " + e, identifier, global);
+        }
 	}
-
-	private ClientGetter makeGetter(Bucket ret) {
+
+    private ClientGetter makeGetter(Bucket ret) throws IOException {
+        return makeGetter(null, ret);
+    }
+
+    private ClientGetter makeGetter(NodeClientCore core, Bucket ret) throws IOException {
+        if (binaryBlob && ret == null) {
+            ret = core.clientContext.getBucketFactory(persistence == Persistence.FOREVER).makeBucket(fctx.maxOutputLength);
+        }
+
 	    return new ClientGetter(this,
                 uri, fctx, priorityClass,
                 binaryBlob ? new NullBucket() : ret, binaryBlob ? new BinaryBlobWriter(ret) : null, false, initialMetadata, extensionCheck);
@@ -344,7 +359,7 @@ public void onLostConnection(ClientContext context) {
 	@Override
 	public void onSuccess(FetchResult result, ClientGetter state) {
 		Logger.minor(this, "Succeeded: "+identifier);
-		Bucket data = result.asBucket();
+		Bucket data = binaryBlob ? state.getBlobBucket() : result.asBucket();
 		synchronized(this) {
 			if(succeeded) {
 				Logger.error(this, "onSuccess called twice for "+this+" ("+identifier+ ')');