summaryrefslogtreecommitdiffstats
path: root/filedistribution/src/main/java
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-01-30 09:33:06 +0100
committerHarald Musum <musum@oath.com>2018-01-30 09:33:06 +0100
commit9869141c46d299e84ac9285a3ee575e49cb1970a (patch)
treeb40990015d6fb48059654c3ba2fcd66a3c34ea17 /filedistribution/src/main/java
parent0e6ec009fcce1796b4d9ad0ad7accaa403221930 (diff)
Fix bug where nextContent() always returned all data
Diffstat (limited to 'filedistribution/src/main/java')
-rw-r--r--filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDataBlob.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDataBlob.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDataBlob.java
index f0db12a45fc..c22770395d3 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDataBlob.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDataBlob.java
@@ -9,6 +9,7 @@ import java.nio.ByteBuffer;
public class FileReferenceDataBlob extends FileReferenceData {
private final byte[] content;
private final long xxhash;
+ private boolean contentRead = false;
public FileReferenceDataBlob(FileReference fileReference, String filename, Type type, byte[] content) {
this(fileReference, filename, type, content, XXHashFactory.fastestInstance().hash64().hash(ByteBuffer.wrap(content), 0));
@@ -27,10 +28,16 @@ public class FileReferenceDataBlob extends FileReferenceData {
public ByteBuffer content() {
return ByteBuffer.wrap(content);
}
+
@Override
public int nextContent(ByteBuffer bb) {
- bb.put(content);
- return content.length;
+ if (contentRead) {
+ return -1;
+ } else {
+ contentRead = true;
+ bb.put(content);
+ return content.length;
+ }
}
@Override