summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-12-08 18:52:27 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2017-12-08 18:52:27 +0100
commitf83c2be974ce171d7d2d32fdf642f5b8bf69fcfa (patch)
tree2c8978fa67e755e2f6200c74c6a994e705aad5e9 /configserver
parent6bffc191b8689e0dac623d0db90790719a896634 (diff)
Use a ByteChannel interface instead.
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index 17368b48e59..4d50cc16fd9 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -430,7 +430,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
fileBlob.parameters().add(new StringValue(fileData.fileReference().value()));
fileBlob.parameters().add(new StringValue(fileData.filename()));
fileBlob.parameters().add(new StringValue(fileData.type().name()));
- fileBlob.parameters().add(new DataValue(fileData.content()));
+ fileBlob.parameters().add(new DataValue(fileData.content().array()));
fileBlob.parameters().add(new Int64Value(fileData.xxhash()));
fileBlob.parameters().add(new Int32Value(status.getCode()));
fileBlob.parameters().add(new StringValue(status.getDescription()));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
index 5fcaee6e590..b0dce359d58 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
@@ -103,7 +103,7 @@ public class FileServerTest {
}
@Override
public void receive(FileReferenceData fileData, FileServer.ReplayStatus status) {
- this.content.complete(fileData.content());
+ this.content.complete(fileData.content().array());
}
}